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

jinpengyong

2023-08-22 e6f974ca6eab798c2df5c09cdb8320ecf4ff4185

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

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

    /**
     * 时间