Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/task.git

xufenglei

2017-11-02 5d686103fbb4361bebc305c731c9358d038e2836

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



}