Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

# Conflicts:
#	src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml

src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml

@@ -327,12 +327,12 @@
     <select id="getWorkerAttendanceMaxTime" resultType="java.lang.String">
         SELECT max(a.create_time)
         from worker_attendance a
-                 INNER JOIN worker_info b ON a.person_sn = b.person_sn
+        INNER JOIN worker_info b ON a.person_sn = b.person_sn
         WHERE b.id = #{workerId}
-          AND a.pass_type = 2
+        AND a.pass_type = 2
-          AND a.is_statistics = 0
+        AND a.is_statistics = 0
-          AND a.create_time >= CONCAT(DATE_FORMAT(NOW(), "%Y-%m-%d"), ' 00:00:00')
+        AND a.create_time >= CONCAT(DATE_FORMAT(NOW(), "%Y-%m-%d"), ' 00:00:00')
-          and a.create_time &lt;= CONCAT(DATE_FORMAT(NOW(), "%Y-%m-%d"), ' 23:59:59')
+        and a.create_time &lt;= CONCAT(DATE_FORMAT(NOW(), "%Y-%m-%d"), ' 23:59:59')
     </select>
     <select id="selectAttendancePersonTotalCount" resultType="java.util.Map">
         SELECT DATE_FORMAT(a.create_time, "%Y-%m-%d") dayTitle, count(DISTINCT a.person_sn) num