From f7075ed1a8f563d3217fbbd4db335f8ca661fc07 Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Thu, 8 Aug 2024 09:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/business/DcPerceivedEventsWarningMapper.xml      | 4 ++--
 .../src/main/resources/mapper/business/DcWarningMapper.xml  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
index f8beab84..e5c2ac2f 100644
--- a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
@@ -330,8 +330,8 @@
     </select>
     <select id="selectWarningEscalation" resultType="java.util.HashMap">
         select org.organization_name,warning.warning_type,warning.warning_subclass,
-        warning_title,warning.warning_state,DATE_FORMAT(warning.warning_time,'%Y-%m-%d %H:%m:%s') warningTime,
-        warning. warning_source,DATE_FORMAT(warning.create_time,'%Y-%m-%d %H:%m:%s') createTime from dc_warning as warning
+        warning_title,warning.warning_state,DATE_FORMAT(warning.warning_time,'%Y-%m-%d %H:%i:%s') warningTime,
+        warning. warning_source,DATE_FORMAT(warning.create_time,'%Y-%m-%d %H:%i:%s') createTime from dc_warning as warning
         LEFT JOIN dc_stake_mark as mark on warning.stake_mark=mark.stake_mark and mark.direction=warning.direction
         LEFT JOIN dc_organization as org on mark.stake_mark=org.stake_mark
         <where>
diff --git a/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml
index 082cbee8..8bb2b1c8 100644
--- a/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml
@@ -37,10 +37,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectDcWarningVo">
         select id, stake_mark stakeMark, direction, dept_id deptId,
                warning_state warningState,vehicle_type  vehicleType,
-               DATE_FORMAT(warning_time,'%Y-%m-%d %H:%m:%s')warningTime,
+               DATE_FORMAT(warning_time,'%Y-%m-%d %H:%i:%s')warningTime,
                user_id userId, warning_source warningSource, warning_level warningLevel,
-               remark,   DATE_FORMAT(create_time,'%Y-%m-%d %H:%m:%s')createTime,
-               DATE_FORMAT(update_time,'%Y-%m-%d %H:%m:%s')updateTime,
+               remark,   DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%s')createTime,
+               DATE_FORMAT(update_time,'%Y-%m-%d %H:%i:%s')updateTime,
                warning_type warningType, warning_subclass warningSubclass, warning_title warningTitle,
                other_config otherConfig, lane from dc_warning
     </sql>