Merge remote-tracking branch 'origin/master'

沈斌

2017-11-28 70c4207810e4348ad9c125c44cbb6842ecd8b4b7

 src/main/java/com/moral/monitor/service/ScreenService.java

@@ -17,4 +17,8 @@


   Map<String, Object> getAverageBySensor(Map<String, Object> parameters);



   Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);



   Map<String, Object> getDayAQIBySensor(Map<String, Object> parameters) throws Exception;



}