Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-08-21 c386b102a2397d569131e3a459465ba84e2376be

 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;
@@ -24,7 +26,7 @@
    /**
     * 城市code
     */
    private String cityCode;
    private String guid;

    /**
     * 时间