From 3ca7f722f25c1908bc4588c75dbde1f56a8d9877 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 26 三月 2021 10:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 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 2c1a29f..a090e6d 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
@@ -9,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;
@@ -66,6 +67,9 @@
 
     @ApiModelProperty("性别 1 男 2 女")
     private Integer sex;
+    
+    @ApiModelProperty("是否社区团队或者党委 1 是 2 否")
+    private Integer ismemberrole;
 
     @ApiModelProperty("生日")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -146,6 +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;
+
+
 
 
 

--
Gitblit v1.7.1