Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-07 501ebd43da6372ee753d422290327e339b04abb5

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

@@ -9,7 +9,9 @@
   

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



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

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



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





}