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

cjl

2023-10-27 509c208bab15c3b125b5e3f8e6df141fb1d85acb

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

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

    /**
     * 时间