From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
index f482a9b..5f123cf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
@@ -40,11 +40,11 @@
@Pattern(groups = {AddGroup.class},message="【手机号】格式错误",regexp = "1[3|4|5|7|8][0-9]\\d{8}")
private String phone;
- @ApiModelProperty("状态")
+ @ApiModelProperty("状态 1 启用 2 禁用")
@Min(groups = {AddGroup.class},value =1,message = "账户状态不能为空")
private Integer status;
- @ApiModelProperty(value = "人员所在平台 用户类型 1 小程序 2 运营平台 3 社区平台",hidden = true)
+ @ApiModelProperty(value = "人员所在平台 用户类型 1 小程序 2 运营平台 3 社区平台 4 街道平台 5 商家",hidden = true)
private Integer type;
@ApiModelProperty(value = "小区id",hidden = true)
@@ -73,4 +73,13 @@
@ApiModelProperty(value = "角色名字")
private String roleName;
+ @ApiModelProperty(value = "商铺名称")
+ private String shopStoreName;
+
+ @ApiModelProperty(value = "商铺Id")
+ private String shopStorePhone;
+
+ @ApiModelProperty(value = "用户昵称")
+ private String nickName;
+
}
--
Gitblit v1.7.1