Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-07 501ebd43da6372ee753d422290327e339b04abb5

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

@@ -5,10 +5,8 @@


public interface HistoryService {



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

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



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



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



}