Merge branch 'bfyMa' of D:\ccsens\carbasics with conflicts.

src/main/resources/mapper_dao/FirstAidDao.xml

@@ -256,7 +256,7 @@
         AND op.rec_status = 0
         AND f.rec_status = 0
         <if test="startTime != null and startTime != ''">
-        AND  f.created_at > FROM_UNIXTIME(#{startTime}/1000,'%Y-%m-%d %H:%i:%s')
+        AND  f.created_at > FROM_UNIXTIME(#{startTime}/1000,'%Y-%m-%d %H:%i:%S')
         </if>
         ORDER BY f.created_at DESC
     </select>