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

cjl

2023-08-18 41660a11fb793295d44a4d47949284105e429395

 screen-manage/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java

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

import java.util.Map;

import com.moral.api.entity.HistoryHourly;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>