From 575e94e9db7e507ecec2441d24a13e9415fd9f03 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 19 五月 2021 19:56:05 +0800
Subject: [PATCH] Merge branch 'cedoodev' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
index c922521..83a9755 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
@@ -8,6 +9,7 @@
import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
import lombok.Data;
import javax.validation.constraints.Min;
@@ -64,11 +66,13 @@
private String communityName;
@ApiModelProperty("性别 1 男 2 女")
- @Min(value = 1,groups = {AddGroup.class},message = "性别不能为空")
private Integer sex;
+
+ @ApiModelProperty("是否本社区的团队或者党委、或是系统管理人员 1 是 2 否")
+ private Integer ismemberrole;
@ApiModelProperty("生日")
- @NotNull(groups = {AddGroup.class},message = "生日不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthday;
@ApiModelProperty("头像")
@@ -78,7 +82,6 @@
private Integer type;
@ApiModelProperty("职业")
- @NotBlank(groups = {AddGroup.class},message = "职业不能为空")
private String job;
@ApiModelProperty("是否志愿者 0否 1 是")
@@ -137,8 +140,8 @@
private List<ComMngStructHouseVO> comMngStructHouseVOS;
@ApiModelProperty("用户小区id")
- @Min(value = 1,groups = {PutGroup.class},message = "用户小区id不能为空")
- @NotNull(groups = {PutGroup.class},message = "用户小区id不能为空")
+// @Min(value = 1,groups = {PutGroup.class},message = "用户小区id不能为空")
+// @NotNull(groups = {PutGroup.class},message = "用户小区id不能为空")
private Long areaId;
@ApiModelProperty("用户所在社区信息")
@@ -147,8 +150,23 @@
@ApiModelProperty("小区信息")
private ComMngStructAreaVO comMngStructAreaVO;
+ @ApiModelProperty("0 未申请 1 申请中 2 通过 3 驳回")
+ private Integer volunteerStatus;
+ @ApiModelProperty("是否注册 0 否 1 是")
+ private Integer isRegister;
+ @ApiModelProperty("年龄")
+ private Integer age;
+
+ @ApiModelProperty("政治面貌：1 - 党员；2 - 团员；3 - 群众")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty("小程序首页是否显示公告(1.是 2.否)")
+ private Integer isTips;
+
+ @ApiModelProperty("是否已实名")
+ private Boolean isRealNamed;
}
--
Gitblit v1.7.1