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

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

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

@@ -2,8 +2,6 @@

import java.util.Map;

import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.entity.HistoryHourly;

/**
 * <p>
@@ -15,6 +13,7 @@
 */
public interface HistoryMinutelyService {

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

}