From b11f71120cbf2aac463d0a53d12799ca5cf07b05 Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Wed, 24 Nov 2021 16:34:56 +0800
Subject: [PATCH] Merge branch 'bfyMa' of D:\ccsens\carbasics with conflicts.

---
 src/main/resources/mapper_dao/FirstAidDao.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mapper_dao/FirstAidDao.xml b/src/main/resources/mapper_dao/FirstAidDao.xml
index d6532a1..6be5467 100644
--- a/src/main/resources/mapper_dao/FirstAidDao.xml
+++ b/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>