Merge remote-tracking branch 'origin/master'

沈斌

2017-11-11 45be44fb95325305373647231ef74e72d1501f8c

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



}