Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

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

@@ -38,8 +38,6 @@

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

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

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

}