From a1cf90b0e3641bf60d7e10e84345bb8f2cfc1424 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 27 Oct 2017 10:27:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/monitor/service/ScreenService.java b/src/main/java/com/moral/monitor/service/ScreenService.java
index 7265a13..1e9a0cc 100644
--- a/src/main/java/com/moral/monitor/service/ScreenService.java
+++ b/src/main/java/com/moral/monitor/service/ScreenService.java
@@ -9,8 +9,10 @@
 
 	List<AccountEntity> getAccountLists(String account, String password);
 
-	Map<String, Object> getDataByEquipmentMac(Map<String, Object> parameters);
+	Map<String, Object> getMonthDataByEquipment(Map<String, Object> parameters);
 
 	Map<String, Object> getAverageByAll(Map<String, Object> parameters);
 
+	Map<String, Object> getEquipmentStates(Map<String, Object> parameters);
+
 }

--
Gitblit v1.8.0