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

cjl

2023-10-25 090f4dac98c412c5734a706b853724e2d2accda4

 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;