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

DESKTOP-71BH0QO\L、ming

2021-05-10 b7ee93df9c0f10ce17431fd1ef33506742977b82

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

@@ -79,4 +79,7 @@
    @ApiModelProperty(value = "商铺Id")
    private String shopStorePhone;

    @ApiModelProperty(value = "用户昵称")
    private String nickName;

}