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

cjl

2023-09-28 ff65dc92b93fe082e4e3b26cd949ebf6ece554e1

 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>