From bcc3e41bdd1865c288f7d570ce4da1d5cea32462 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 14:13:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

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

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

--
Gitblit v1.8.0