Merge remote-tracking branch 'origin/master'

沈斌

2018-02-08 9e1db983254a475fd7a069937c3f706fe2efe9b4

 src/main/java/com/moral/service/HistoryMinutelyService.java

@@ -11,5 +11,7 @@


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



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





}