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

cjl

2023-07-12 08b52ba6e8930958456ed58a1d39805caa7fe014

 screen-manage/src/main/java/com/moral/api/service/HistoryMinutelyService.java

@@ -13,6 +13,7 @@
 */
public interface HistoryMinutelyService {

    void insertHistoryMinutely(Map<String, Object> deviceData);
    //分钟数据insert
    void insertHistoryMinutely(Map<String, Object> data);

}