Merge remote-tracking branch 'origin/master'

沈斌

2017-11-07 ba9a621c55f520be8e26cdb0d3ad61b5246b2fc1

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



}