Merge branch 'shuangzheng2' into huacheng_test

101captain

2022-08-01 f4d47d91a8bf41426497a0c42c10f5a78af0259b

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngCityDO.java

@@ -11,7 +11,7 @@
public class ComMngCityDO {
    /** 自增 id */
    @TableId(type = IdType.ASSIGN_ID)
    private Integer id;
    private Long id;

    /** 城市名称 */
    private String cityName;
@@ -23,5 +23,5 @@
    private Integer provinceAdcode;

    /** 省份 id */
    private Integer provinceId;
    private Long provinceId;
}