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

huanghongfa

2021-06-17 98e440f566479fe07b0a6d0028e3df21843c86ee

 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;

}