Merge remote-tracking branch 'origin/master'

沈斌

2017-11-15 ad42a81e625f1e7a982a94994d7d5f3314c71fbd

 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);