From ac243fe660a636910489daeab8aa52cd3dc5d8b7 Mon Sep 17 00:00:00 2001
From: jiayang yue <jiayang.yue@xujiesoft.com>
Date: Mon, 9 Jun 2025 18:50:05 +0800
Subject: [PATCH] =?UTF-8?q?2025.06.09=20=E6=A0=87=E7=AD=BE=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E5=8A=9F=E8=83=BD=20=E6=A0=87=E7=AD=BE=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E7=A9=BA=E7=99=BD=E9=A1=B5=E3=80=81=E5=8D=B7=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E4=BB=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gaotao/modules/factory/entity/Site.java   |  6 +++++
 .../modules/sys/entity/SysUserEntity.java     | 22 +++++++++++++++++++
 .../resources/mapper/factory/SiteMapper.xml   |  4 +++-
 src/main/resources/mapper/sys/SysUserDao.xml  |  4 ++++
 4 files changed, 35 insertions(+), 1 deletion(-)

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
         <where>
             <if test="siteId != null and siteId != ''">
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