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

cjl

2023-10-25 090f4dac98c412c5734a706b853724e2d2accda4

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

}