From 11cbff75d8b18ce599a05cbb4d84cec104583358 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 20 Jun 2024 16:28:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
index 99f3676..8e978c0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
@@ -25,10 +25,10 @@
             and sst.content like concat('%',#{smsResult.templateContent},'%')
         </if>
         <if test="smsResult.startTime!=null and smsResult.startTime!=''">
-            and date_format(ssr.create_time,'%Y-%m-%d') >= #{smsResult.startTime}
+            and ssr.create_time >= #{smsResult.startTime}
         </if>
         <if test="smsResult.endTime!=null and smsResult.endTime!=''">
-            and date_format(ssr.create_time,'%Y-%m-%d') &lt;= #{smsResult.endTime}
+            and ssr.create_time &lt;= #{smsResult.endTime}
         </if>
         <if test="smsResult.smsType!=null and smsResult.smsType!=''">
             and sst.sms_type = #{smsResult.smsType}

--
Gitblit v1.9.3