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

jinpengyong

2023-10-13 20c644e44d92fa02b873fb6189eee71615bc12d2

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

@@ -24,7 +24,7 @@
    /**
     * 城市id
     */
    private String cityCode;
    private Integer cityCode;

    /**
     * 时间