Accept Merge Request #32: (develop-wxl -> master)

Merge Request: 修改字段名

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/smarCampus/d/iHotel_student_houtai/git/merge/32?initial=true

src/main/resources/mapper/template/ApplicationProcedureTemporaryMapper.xml

@@ -42,7 +42,7 @@
         ap.secondary_examine_and_approve_remark,
         a.name as approverName,
         a2.name as secondaryApproverName,
-        u.user_name as userName,
+        u.user_name as usersName,
         o.id as orgId,
         o.name as orgName,
         ap.house_count as houseCount
@@ -60,7 +60,7 @@
             </if>
 
             <if test="key != null and key != ''">
-                AND ( apu.approverName LIKE '%' #{key} '%' OR apu.secondaryApproverName LIKE '%' #{key} '%'  OR apu.userName LIKE '%' #{key} '%'  )
+                AND ( apu.approverName LIKE '%' #{key} '%' OR apu.secondaryApproverName LIKE '%' #{key} '%'  OR apu.usersName LIKE '%' #{key} '%'  )
             </if>
 
             <if test="examineAndApproveStartTime != null and examineAndApproveStartTime != '' and examineAndApproveEndTime != null and examineAndApproveEndTime != '' ">
@@ -186,8 +186,8 @@
         ap.secondary_examine_and_approve_time as secondaryExamineAndApproveTime,
         ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
         a.name as approverName,
-        a2.name as secondaryApproverName
-        u.user_name as userName,
+        a2.name as secondaryApproverName,
+        u.user_name as usersName,
         o.name as orgName,
         ap.house_count as houseCount
         FROM