Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

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

@@ -38,8 +38,7 @@

    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;

}