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

fengxiang

2017-11-13 999d8a80d9a1c1f20033c29e7e2a08951766bee8

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



}