From b2c1a472695dceafa160a515723ab79194c39cdf Mon Sep 17 00:00:00 2001
From: zhengzheng <18918765049@163.com>
Date: Mon, 16 May 2022 20:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zt-admin/src/main/resources/templates/active/user/index.html    | 2 +-
 zt-admin/src/main/resources/templates/enroll/user/index.html    | 2 +-
 zt-system/src/main/resources/mapper/system/ActiveUserMapper.xml | 2 +-
 zt-system/src/main/resources/mapper/system/EnrollUserMapper.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/zt-admin/src/main/resources/templates/active/user/index.html b/zt-admin/src/main/resources/templates/active/user/index.html
index d4a880775..c236c2e2b 100644
--- a/zt-admin/src/main/resources/templates/active/user/index.html
+++ b/zt-admin/src/main/resources/templates/active/user/index.html
@@ -79,7 +79,7 @@
 		        },
 		        {
 		            field: 'playbillAddress',
-		            title: '公司地址',
+		            title: '单位地址',
 		            sortable: true
 		        },
 		        {
diff --git a/zt-admin/src/main/resources/templates/enroll/user/index.html b/zt-admin/src/main/resources/templates/enroll/user/index.html
index 761247e61..679b79714 100644
--- a/zt-admin/src/main/resources/templates/enroll/user/index.html
+++ b/zt-admin/src/main/resources/templates/enroll/user/index.html
@@ -77,7 +77,7 @@
 		        },
 		        {
 		            field: 'playbillAddress',
-		            title: '公司地址',
+		            title: '单位地址',
 		            sortable: true
 		        },
 		        {
diff --git a/zt-system/src/main/resources/mapper/system/ActiveUserMapper.xml b/zt-system/src/main/resources/mapper/system/ActiveUserMapper.xml
index 9577f607e..6b4a06cd1 100644
--- a/zt-system/src/main/resources/mapper/system/ActiveUserMapper.xml
+++ b/zt-system/src/main/resources/mapper/system/ActiveUserMapper.xml
@@ -21,7 +21,7 @@
     </resultMap>
 
     <sql id="selectActiveUserVo">
-        select e.id, e.nick_name, e.post_name, e.phone_number, e.playbill_address,e.recommender_no,e.create_by, e.create_time, e.remark,a.active_title,e.qr_code
+        select e.id, e.nick_name, e.post_name, e.phone_number, e.playbill_address,e.recommender_no,e.create_by, e.create_time, e.remark,a.active_title,UPPER(e.qr_code) as qr_code
         from enroll_user e inner join  active_info a ON e.active_no = a.id
     </sql>
 
diff --git a/zt-system/src/main/resources/mapper/system/EnrollUserMapper.xml b/zt-system/src/main/resources/mapper/system/EnrollUserMapper.xml
index cc9cb138a..b77fb3879 100644
--- a/zt-system/src/main/resources/mapper/system/EnrollUserMapper.xml
+++ b/zt-system/src/main/resources/mapper/system/EnrollUserMapper.xml
@@ -20,7 +20,7 @@
     </resultMap>
 
     <sql id="selectUserVo">
-        select id, nick_name, post_name, phone_number, playbill_address,recommender_no,create_by, create_time, remark,qr_code
+        select id, nick_name, post_name, phone_number, playbill_address,recommender_no,create_by, create_time, remark,UPPER(qr_code) as qr_code
         from enroll_user
     </sql>