From b057f9985a360fcfeb3aa6e96eae99deccffa1d2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 23 六月 2021 14:31:43 +0800
Subject: [PATCH] 特殊群人上报接口，获取系统配置接口
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 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..1c1cfeb 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,21 +66,22 @@
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("头像")
private String imageUrl;
- @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台")
+ @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台")
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,31 @@
@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;
+
+ @ApiModelProperty("上班时间")
+ private Integer workStartTime;
+
+ @ApiModelProperty("下班时间")
+ private Integer workEndTime;
+
+ @ApiModelProperty("高龄认证显示提示（1.是 2.否）")
+ private Integer bigAgeTips;
}
--
Gitblit v1.7.1