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

jinpengyong

2023-08-22 2c743103cfa6e24bcb3fd064845c8cfd8fe8bbe6

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

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

    /**
     * 时间