From 5586964c3e63f95c9e460a6a3d85d7dca408e096 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 18 Oct 2021 14:35:39 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index 846ca66..b9d6c80 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -60,6 +60,7 @@
* @Author: ���������
* @Date: 2021/9/23
*/
+ @Override
public List<HistoryHourly> getValueByMacAndTime(String mac,Date startDate,Date endDate){
QueryWrapper<HistoryHourly> wrapper = new QueryWrapper<>();
wrapper.eq("mac",mac);
@@ -83,6 +84,7 @@
List<HistoryHourly> datas = historyHourlyMapper.selectList(wrapper);
result.addAll(datas);
}
+ MybatisPlusConfig.tableName.remove();
return result;
}
--
Gitblit v1.8.0