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

jinpengyong

2021-11-02 6cc2a1d726e1019079b6d3fa74599426a359c001

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

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

    /**
     * 城市名字