From 2af7739a8517d2d54c0b4f14af5c77e036cf653e Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 31 五月 2021 14:50:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 762d781..335fa1c 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("用户所在社区信息")
@@ -166,4 +166,7 @@
@ApiModelProperty("小程序首页是否显示公告(1.是 2.否)")
private Integer isTips;
+ @ApiModelProperty("是否已实名")
+ private Boolean isRealNamed;
+
}
--
Gitblit v1.7.1