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

cjl

2023-07-07 9f965bfa801be97c4683ae53bcb4ce897228fd14

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

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

    /**
     * 时间