Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

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

@@ -34,10 +34,10 @@

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

    List<Map<String,Object>> get5MinutesOrHalfHour(Map<String, Object> parameters) throws ParseException;
    List<Map<String, Object>> get5MinutesOrHalfHour(Map<String, Object> parameters) throws ParseException;

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

    List<Map<String,Object>> getFiveMinutesDataByMacsAndTime(Map<String,Object> parameters);
    List<Map<String, Object>> getAllDeviceDataToExcel(Map<String, Object> parameters) throws Exception;

}