From 86916a5b7c8ed98221c03e440a9aad0f38109263 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 05 Sep 2018 09:52:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index 1a28271..29cde9f 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -19,4 +19,6 @@
 
 	List<Map<String, Object>> getSensorDataBySensorKey(Map<String, Object> parameters);
 
+	Map<String, Object> getActualDataByRegion(Map<String, Object> parameters);
+
 }

--
Gitblit v1.8.0