From 45db1ff89c6389a2e4b84b252870326d510049ba Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 07 Nov 2017 15:20:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/monitor/service/ScreenService.java b/src/main/java/com/moral/monitor/service/ScreenService.java
index 1e9a0cc..2818cff 100644
--- a/src/main/java/com/moral/monitor/service/ScreenService.java
+++ b/src/main/java/com/moral/monitor/service/ScreenService.java
@@ -15,4 +15,6 @@
 
 	Map<String, Object> getEquipmentStates(Map<String, Object> parameters);
 
+	Map<String, Object> getAverageBySensor(Map<String, Object> parameters);
+
 }

--
Gitblit v1.8.0