Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/StatsStaffPatrolRecordDailyDao.xml

@@ -63,6 +63,10 @@
         ON DUPLICATE KEY UPDATE
             PATROL_TOTAL = values(PATROL_TOTAL),
             TOTAL_TIME = values(TOTAL_TIME),
+            LATEST_PATROL_STATUS = values(LATEST_PATROL_STATUS),
+            LATEST_PATROL_TIME = values(LATEST_PATROL_TIME),
+            REPORT_PROJECT_COUNT = values(REPORT_PROJECT_COUNT),
+            ROUTINE_WORK_COUNT = values(ROUTINE_WORK_COUNT),
             UPDATED_BY = VALUES(UPDATED_BY)
     </insert>
     <delete id="deleteInternal">