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

huanghongfa

2021-05-12 4c93d581de8323667e08bcb00dac88762a49e183

 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;

}