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

cjl

2023-11-01 23ad681499f8652fe4e2084e6492ececb6fc7551

 screen-job/src/main/java/com/moral/api/entity/HistoryAqi.java

@@ -1,5 +1,7 @@
package com.moral.api.entity;

import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.io.Serializable;
import java.util.Date;