Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-09-06 4a4db8924da0782d0b698f7585ad6b0577bdca2d

 screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java

@@ -26,7 +26,7 @@
            * @Author: 陈凯裕
            * @Date: 2021/7/16
            */
    List<DeviceAndFiveMinuteDataDTO> queryDeviceAndFiveMinuteData(QueryDeviceAndFiveMinuteDataForm form);
    List<Map<String, Object>> queryDeviceAndFiveMinuteData(QueryDeviceAndFiveMinuteDataForm form);

    /**
    * @Description: 查询一个设备最新的五分钟数据