3.14优化

ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml

@@ -37,7 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.avatar_name,
             a.dily_time,
             a.finish_today,
-            a.auditor_type
+            a.auditor_type,
+            a.status
         FROM
             wgz_daily_clock a
                 LEFT JOIN wgz_user b ON (a.user_id = b.user_id and b.del_flag = 0)

ruoyi-system/src/main/resources/mapper/wgz/WgzLeaveMapper.xml

@@ -29,8 +29,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="userLeaveHistoryListPage" resultType="com.ruoyi.wgz.bo.res.WgzAppLeaveHistoryListPageRes">
         SELECT
             a.*,
-            b.username,
-            b.avatar_name
+            b.username as auditorname,
+            b.avatar_name as auditorHead
         FROM
             wgz_leave a
                 LEFT JOIN bgt_user b ON (a.auditor_user_id = b.user_id and b.del_flag = 0)