代码提交

zt-admin/src/main/resources/templates/active/user/index.html

@@ -79,7 +79,7 @@
 		        },
 		        {
 		            field: 'playbillAddress',
-		            title: '公司地址',
+		            title: '单位地址',
 		            sortable: true
 		        },
 		        {

zt-admin/src/main/resources/templates/enroll/user/index.html

@@ -77,7 +77,7 @@
 		        },
 		        {
 		            field: 'playbillAddress',
-		            title: '公司地址',
+		            title: '单位地址',
 		            sortable: true
 		        },
 		        {

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>
 

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>