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

tangxiaobao

2021-09-06 a18634e047b46e411dac268a0b3a995c22053ea5

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportUserDTO.java

@@ -19,7 +19,7 @@
    private String phone;
    @ApiModelProperty(value = "小区名字")
    private String areaName;
    @ApiModelProperty(value = "社区id",hidden = true)
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;

}