From ff4135a758efe532ee5566fbdb6d9fee9e8410f8 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 05 Nov 2020 14:32:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/HistoryMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 6d16309..b74a825 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -170,7 +170,7 @@
<insert id="insertHistorySpecialTable">
insert into
history_special(mac, value, time,version)
- SELECT * from history WHERE time>=DATE_SUB(#{time}, INTERVAL 1 HOUR) and time<![CDATA[<]]>#{time} and mac in
+ SELECT * from history WHERE time>=#{startTime} and time<![CDATA[<]]>#{endTime} and mac in
<foreach collection="macList" index="index" item="mac" open="(" separator="," close=")">
#{mac}
</foreach>
--
Gitblit v1.8.0