diff --git a/src/main/java/com/gaotao/modules/factory/entity/Site.java b/src/main/java/com/gaotao/modules/factory/entity/Site.java index 9ced49f..e5375ce 100644 --- a/src/main/java/com/gaotao/modules/factory/entity/Site.java +++ b/src/main/java/com/gaotao/modules/factory/entity/Site.java @@ -47,6 +47,12 @@ public class Site { @TableField("auto_serial_number") private String autoSerialNumber; + @TableField("copies_for_roll_label_flag") + private String copiesForRollLabelFlag; + + @TableField("copies") + private Integer copies; + @TableField("site_code") private String siteCode; diff --git a/src/main/java/com/gaotao/modules/sys/entity/SysUserEntity.java b/src/main/java/com/gaotao/modules/sys/entity/SysUserEntity.java index 673d881..c67d8b7 100644 --- a/src/main/java/com/gaotao/modules/sys/entity/SysUserEntity.java +++ b/src/main/java/com/gaotao/modules/sys/entity/SysUserEntity.java @@ -98,6 +98,12 @@ public class SysUserEntity implements Serializable { @TableField(exist = false) private String autoSerialNumber; + @TableField(exist = false) + private String copiesForRollLabelFlag; + + @TableField(exist = false) + private Integer copies; + @TableField(exist = false) private String siteCode; @@ -255,4 +261,20 @@ public class SysUserEntity implements Serializable { public void setLanguageDefault(String languageDefault) { this.languageDefault = languageDefault; } + + public String getCopiesForRollLabelFlag() { + return copiesForRollLabelFlag; + } + + public void setCopiesForRollLabelFlag(String copiesForRollLabelFlag) { + this.copiesForRollLabelFlag = copiesForRollLabelFlag; + } + + public Integer getCopies() { + return copies; + } + + public void setCopies(Integer copies) { + this.copies = copies; + } } diff --git a/src/main/resources/mapper/factory/SiteMapper.xml b/src/main/resources/mapper/factory/SiteMapper.xml index 5cf7015..8601765 100644 --- a/src/main/resources/mapper/factory/SiteMapper.xml +++ b/src/main/resources/mapper/factory/SiteMapper.xml @@ -21,7 +21,9 @@ auto_serial_number, site_code, show_pound, - factory_code + factory_code, + copies_for_roll_label_flag, + copies from site diff --git a/src/main/resources/mapper/sys/SysUserDao.xml b/src/main/resources/mapper/sys/SysUserDao.xml index 265d6bf..3f9a6a6 100644 --- a/src/main/resources/mapper/sys/SysUserDao.xml +++ b/src/main/resources/mapper/sys/SysUserDao.xml @@ -40,6 +40,8 @@ u.user_type, r.role_name as userTypeDesc, s.auto_serial_number, + s.copies_for_roll_label_flag, + s.copies, s.site_code, s.show_pound from sys_user u @@ -65,6 +67,8 @@ u.user_type, r.role_name as userTypeDesc, s.auto_serial_number, + s.copies_for_roll_label_flag, + s.copies, s.site_code from sys_user u left join sys_user_role ur on u.user_id = ur.user_id