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

huanghongfa

2021-07-05 2dcf4b9d75cc1b6613aea59cec4a0f9cc97f1c0e

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java

@@ -123,6 +123,9 @@
    private String nativePlace;

    @ApiModelProperty("民族")
    private String nationCode;

    @ApiModelProperty("民族")
    private String nation;

    @ApiModelProperty("小区名字")
@@ -156,6 +159,11 @@
    @ApiModelProperty("户口所在地")
    private String censusRegister;

    /**
     * 居住地址
     */
    private String address;

    @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
    private Integer relation;