Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/java/com/moral/mapper/HistoryMinutelyMapper.java

@@ -32,6 +32,7 @@

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

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

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