From ad42a81e625f1e7a982a94994d7d5f3314c71fbd Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 15 Nov 2017 14:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/monitor/service/ScreenService.java |    2 +-
 1 files changed, 1 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 2818cff..c6c5bce 100644
--- a/src/main/java/com/moral/monitor/service/ScreenService.java
+++ b/src/main/java/com/moral/monitor/service/ScreenService.java
@@ -9,7 +9,7 @@
 
 	List<AccountEntity> getAccountLists(String account, String password);
 
-	Map<String, Object> getMonthDataByEquipment(Map<String, Object> parameters);
+	Map<String, Object> getMonthDataByEquipment(Map<String, Object> parameters) throws Exception;
 
 	Map<String, Object> getAverageByAll(Map<String, Object> parameters);
 

--
Gitblit v1.8.0