From 65007f6811e580d8660340b8216296e68fae598c Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Tue, 01 Dec 2020 16:04:18 +0800 Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2 --- 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