From d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 18 Nov 2020 14:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/HistoryHourlyService.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryHourlyService.java b/src/main/java/com/moral/service/HistoryHourlyService.java
index ded5838..0e99fea 100644
--- a/src/main/java/com/moral/service/HistoryHourlyService.java
+++ b/src/main/java/com/moral/service/HistoryHourlyService.java
@@ -26,4 +26,6 @@
List<Map<String, Object>> getDataByTimeSlot(String mac, String startTime, String endTime) throws Exception;
List<Map> getDataByMacAndTime(Map param);
+
+ List<Map> getDataAvbByMIdAndTime(String mId,String startTime,String endTime);
}
--
Gitblit v1.8.0