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

jinpengyong

2023-08-03 57f903e0eb21bd66c88ebc00ccc9d30b49d36f3e

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

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

    /**
     * 时间