From 6712b6d4d3bd39713d387fead75b7d65f8d157c2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 27 Sep 2023 19:02:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
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