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

cjl

2023-09-27 dc1c8c974d9469591ead4dd1d774bbfb97a33331

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

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

    /**
     * 时间