From dea1c76d938a21f6427ba94c933ac5ad75385d14 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 04 八月 2022 12:01:47 +0800
Subject: [PATCH] 活动积分修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java | 69 ++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 16 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..68857ec 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
@@ -1,14 +1,18 @@
package com.panzhihua.common.model.vos.user;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.panzhihua.common.validated.AddGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.Date;
import javax.validation.constraints.Min;
import javax.validation.constraints.Pattern;
-import java.util.Date;
+
+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;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -21,39 +25,42 @@
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("角色")
- @Min(value =1,groups = {AddGroup.class},message = "角色不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @Min(value = 1, groups = {AddGroup.class}, message = "角色不能为空")
private Long roleId;
@ApiModelProperty("手机号")
- @Pattern(groups = {AddGroup.class},message="【手机号】格式错误",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("状态")
- @Min(groups = {AddGroup.class},value =1,message = "账户状态不能为空")
+ @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)
+ @ApiModelProperty(value = "小区id", hidden = true)
private Long areaId;
- @ApiModelProperty(value = "社区id",hidden = true)
+ @ApiModelProperty(value = "社区id", hidden = true)
private Long communityId;
@ApiModelProperty(value = "用户主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@ApiModelProperty(value = "当前页数")
@@ -73,4 +80,34 @@
@ApiModelProperty(value = "角色名字")
private String roleName;
+ @ApiModelProperty(value = "商铺名称")
+ private String shopStoreName;
+
+ @ApiModelProperty(value = "商铺Id")
+ private String shopStorePhone;
+
+ @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;
}
--
Gitblit v1.7.1