Merge branch 'hemenkou_dev' into dev

101captain

2022-03-03 ae812df91394e0f3ee628ff5dbd5c54f6d6a3743

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java

@@ -88,4 +88,17 @@
    @ApiModelProperty(value = "身份证")
    private String idCard;

    @ApiModelProperty("头像")
    private String imageUrl;

    private String areaCode;

    @ApiModelProperty(value = "街道id")
    private Long streetId;

    @ApiModelProperty(value = "三社账户类型  1街道 2社会组织 3社会组织成员")
    private Integer socialType;

    @ApiModelProperty("社会组织id")
    private Long orgId;
}