Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 f1e25082a58c8cb57dd45d226d3a94f4af4a0677

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

@@ -5,12 +5,6 @@


public interface HistoryMapper{



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



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



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



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



}