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

puhanshu

2022-03-14 b92edf56e7e25440e7c46b967aa5373a7a8b25c2

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

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

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

    private String areaCode;

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