Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 f1e25082a58c8cb57dd45d226d3a94f4af4a0677

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

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

   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;





}