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

cjl

2023-09-01 979166aaa979629bf223a44a46aeb6d0c0e61aec

 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);

}