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/ComMngDistrictDO.java

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

    /** 区县名称 */
    private String districtName;
@@ -23,11 +23,11 @@
    private Integer cityAdcode;

    /** 城市 id */
    private Integer cityId;
    private Long cityId;

    /** 省份行政区划代码 */
    private Integer provinceAdcode;

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