Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-06 f4ed03e33cd777996c697894c4075128546c3a74

 src/main/java/com/moral/mapper/HistoryMinutelyMapper.java

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


public interface HistoryMinutelyMapper{



   Map<String, Double> getDayAQIByDevice(Map<String, Object> parameters);

   Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters);



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