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

jinpengyong

2021-06-23 a4d06b1354d48d94c8e07d716863bcb7d3876a07

 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>