From 74b1e900e888711994315dc100dacc2e6c84aba5 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 06 三月 2024 15:45:11 +0800
Subject: [PATCH] 修改参加活动金汇币明细报错9
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 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 0e5361a..ddebd08 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
@@ -6,6 +6,8 @@
import javax.validation.constraints.Pattern;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -27,8 +29,8 @@
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 = "密码强度过低，请将密码长度设置为8-16位，且包含字母、数字、字符。",
+ regexp = "^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\W_!@#$%^&*.`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\\W_!@#$%^&.*`~()-+=]+$)(?![0-9\\W_!@#$%^.&*`~()-+=]+$)[a-zA-Z0-9\\W_!@#$%^&.*`~()-+=]{8,16}$")
private String password;
@ApiModelProperty("用户名称")
@@ -36,6 +38,7 @@
private String name;
@ApiModelProperty("角色")
+ @JsonSerialize(using = ToStringSerializer.class)
@Min(value = 1, groups = {AddGroup.class}, message = "角色不能为空")
private Long roleId;
@@ -57,6 +60,7 @@
private Long communityId;
@ApiModelProperty(value = "用户主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@ApiModelProperty(value = "当前页数")
@@ -85,4 +89,28 @@
@ApiModelProperty(value = "用户昵称")
private String nickName;
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ @ApiModelProperty("头像")
+ private String imageUrl;
+
+ private String areaCode;
+
+ @ApiModelProperty(value = "街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long streetId;
+
+ @ApiModelProperty(value = "三社账户类型 1街道 2社会组织 3社会组织成员")
+ private Integer socialType;
+
+ @ApiModelProperty("社会组织id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long orgId;
+
+ @ApiModelProperty("绑定单位")
+ private String relationName;
+
+ private String appid;
+ private String loveIntegral;
}
--
Gitblit v1.7.1