From cd264145f9b4107f1430da46269dd306d26f3116 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 16 Nov 2020 13:16:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/HistoryMinutelyService.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index fe65a54..35be96b 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -38,7 +38,6 @@
List<Map<String, Object>> getMultiDeviceSensorData(Map<String, Object> parameters) throws Exception;
-
List<Map<String, Object>> getAllDeviceDataToExcel(Map<String, Object> parameters) throws Exception;
}
--
Gitblit v1.8.0