Merge remote-tracking branch 'origin/master'

沈斌

2018-01-30 b4cabe178f1a36433270c79048beecfab0edc487

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

@@ -1,6 +1,5 @@
package com.moral.service;



import java.util.List;

import java.util.Map;





@@ -10,9 +9,6 @@


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



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



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



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

}