From d6578ec702eb4fcff690d71ea3237a885f46b85c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 06 七月 2022 15:37:49 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 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 a847501..47b9a7a 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
@@ -184,11 +184,19 @@
@ApiModelProperty("是否社区工作人员 1.是 2.否")
private Integer isCommunityWorker;
+ @ApiModelProperty("是否社工 1.是 2.否")
+ private Integer isSocialWorker;
+
@ApiModelProperty("实名认证地址")
private String address;
@ApiModelProperty("是否物业工作人员 1.是 2.否")
private Integer isPropertyWorker;
+
+ @ApiModelProperty("是否微团队成员 1.是 2.否")
+ private Integer isFmsMember;
+ @ApiModelProperty("是否网格员 1.是 2.否")
+ private Integer isEasyPhotoMember;
@ApiModelProperty("appid")
private String appId;
@@ -196,4 +204,29 @@
private String appSecret;
@ApiModelProperty("areaCode")
private String areaCode;
+ @ApiModelProperty("街道id")
+ private Long streetId;
+
+ @ApiModelProperty("账号类型 1街道 2社区 3社会组织")
+ private Integer userType;
+
+ @ApiModelProperty("是否是防疫工作人员 1.是 2.否")
+ private Integer isAcidMember;
+
+ @ApiModelProperty("绑定单位")
+ private String relationName;
+
+ @ApiModelProperty("区域划分")
+ private String areaName;
+
+ @ApiModelProperty("是否单位管理员 1是 0否")
+ private Integer isCheckUnitAdmin;
+
+ @ApiModelProperty("报道单位id")
+ private Long checkUnitId;
+
+
+ public String retrieveRelationName() {
+ return this.type == 3 ? relationName : name;
+ }
}
--
Gitblit v1.7.1