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

cjl

2023-09-12 87c10f8ad1cd11d126dabeea6071cdee617dbfa5

 screen-api/src/main/java/com/moral/api/entity/Forecast.java

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

    /**
     * 时间