From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 1647c1d..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
@@ -21,15 +21,15 @@
public class AdministratorsUserVO {
@ApiModelProperty("账户")
- @Pattern(groups = {AddGroup.class},message="账户2-20个字符，英文，数字",regexp="^[0-9A-Za-z]{2,20}$")
+ @Pattern(groups = {AddGroup.class},message="【账户】2-20个字符，英文，数字",regexp="^[0-9A-Za-z]{2,20}$")
private String account;
@ApiModelProperty("密码")
- @Pattern(groups = {AddGroup.class},message="密码格式为6-16个字符，英文，数字，且必须包含英文和数字",regexp="^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")
+ @Pattern(groups = {AddGroup.class},message="【密码】格式为6-16个字符，英文，数字，且必须包含英文和数字",regexp="^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")
private String password;
@ApiModelProperty("用户名称")
- @Pattern(groups = {AddGroup.class},message="用户名称2-16个字符，英文，中文，数字",regexp="^[0-9A-Za-z\u4e00-\u9fa5]{2,16}$")
+ @Pattern(groups = {AddGroup.class},message="【用户名称】2-16个字符，英文，中文，数字",regexp="^[0-9A-Za-z\u4e00-\u9fa5]{2,16}$")
private String name;
@ApiModelProperty("角色")
@@ -37,14 +37,14 @@
private Long roleId;
@ApiModelProperty("手机号")
- @Pattern(groups = {AddGroup.class},message="2-16个字符，英文，中文，数字",regexp = "1[3|4|5|7|8][0-9]\\d{8}")
+ @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