From 9b02f67b17b9dcbd798862021ac0a516d1ba69b3 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Fri, 06 Nov 2020 15:37:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/mapper/HistoryMinutelyMapper.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
index ecb0b2d..ca65349 100644
--- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
@@ -31,4 +31,8 @@
     List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters);
 
     List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(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