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/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