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/mapper/HistoryMinutelyMapper.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
index 516b9ec..ca65349 100644
--- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
@@ -32,6 +32,7 @@
List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters);
- Map<String,Object> get5MiutesOrHalfHourByDay(Map<String, Object> parameters);
+ Map<String, Object> get5MiutesOrHalfHourByDay(Map<String, Object> parameters);
+ List<Map<String, Object>> getMultiDeviceSensorData(Map<String, Object> parameters);
}
--
Gitblit v1.8.0