From 73f86cb94faa49f1157d6c9f00737a28f63507f4 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 09:52:48 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 16 ++++++++++++++++
1 files changed, 16 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 97ef8a9..59e4535 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
@@ -14,6 +14,7 @@
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
+import com.panzhihua.common.model.vos.shop.ComShopUserAddressVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.RoleVO;
import com.panzhihua.common.validated.AddGroup;
@@ -244,6 +245,9 @@
private Long bindingCheckUnitId;
+ @ApiModelProperty("后台账号类型")
+ private Integer backstageType;
+
public String retrieveRelationName() {
return this.type == 3 ? relationName : name;
@@ -251,4 +255,16 @@
@ApiModelProperty("权限等级1-5：超管-行业分中心-街道-社区-专家")
private Integer level;
+
+ @ApiModelProperty("物业公司id")
+ private Long propertyId;
+
+ @ApiModelProperty("商家后台账号id")
+ private Long backstageUserId;
+
+ @ApiModelProperty("是否为自提点")
+ private Boolean isPoint;
+
+ @ApiModelProperty("默认地址")
+ private ComShopUserAddressVO comShopUserAddressVO;
}
--
Gitblit v1.7.1