Merge branch 'test_screen' into 'master'

罗元桥

2021-06-21 3f78e5a92b54cfa64425e73611ae0ac7ba81bc52

 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;

}