From ff719d9fbdc1bc590eb062b24f26f8e12cb85fab Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 27 四月 2021 16:55:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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..762d781 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 是")
@@ -147,8 +150,20 @@
@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;
}
--
Gitblit v1.7.1