From a3aa71fd0ba1b48fe52f080e8d2776f50c5ed514 Mon Sep 17 00:00:00 2001 From: CeDo <cedoogle@gmail.com> Date: 星期二, 27 四月 2021 11:32:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 13 +++++++++++++ 1 files changed, 13 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 8d70ed7..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 @@ -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") @@ -150,7 +154,16 @@ 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