From f979b967a74bfdbfe7d2913a35ba98344838e59b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 14 Sep 2023 12:56:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
index 3a96058..f69bdb2 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
@@ -75,7 +75,7 @@
             `time`
         FROM `history_second_cruiser`
         WHERE mac = #{mac}
-          AND `time` <![CDATA[>=]]> #{time1}
-          AND `time` <![CDATA[<=]]> #{time2}
+          AND `time` <![CDATA[>=]]> #{startTime}
+          AND `time` <![CDATA[<=]]> #{endTime}
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0