From 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/service/HistoryMinutelyService.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 7e8e0c2..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>> getDevicesSensorsToExcel(Map<String, Object> parameters);
+    List<Map<String, Object>> getAllDeviceDataToExcel(Map<String, Object> parameters) throws Exception;
 
 }

--
Gitblit v1.8.0