From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 19 ++++++++++++++-----
1 files changed, 14 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 b14e2cc..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
@@ -68,7 +68,7 @@
@ApiModelProperty("性别 1 男 2 女")
private Integer sex;
- @ApiModelProperty("是否社区团队或者党委或管理员 1 是 2 否")
+ @ApiModelProperty("是否本社区的团队或者党委、或是系统管理人员 1 是 2 否")
private Integer ismemberrole;
@ApiModelProperty("生日")
@@ -78,7 +78,7 @@
@ApiModelProperty("头像")
private String imageUrl;
- @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台")
+ @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台")
private Integer type;
@ApiModelProperty("职业")
@@ -140,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("用户所在社区信息")
@@ -153,7 +153,6 @@
@ApiModelProperty("0 未申请 1 申请中 2 通过 3 驳回")
private Integer volunteerStatus;
-
@ApiModelProperty("是否注册 0 否 1 是")
private Integer isRegister;
@@ -163,9 +162,19 @@
@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