From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java |   21 +++++++++++++++++++++
 1 files changed, 21 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 c951adc..7430e2b 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,7 +14,9 @@
 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;
 import com.panzhihua.common.validated.PutGroup;
 
@@ -243,10 +245,29 @@
 
     private Long bindingCheckUnitId;
 
+    @ApiModelProperty("后台账号类型")
     private Integer backstageType;
 
 
     public String retrieveRelationName() {
         return this.type == 3 ? relationName : name;
     }
+
+    @ApiModelProperty("权限等级1-5:超管-行业分中心-街道-社区-专家")
+    private Integer level;
+
+    @ApiModelProperty("物业公司id")
+    private Long propertyId;
+
+    @ApiModelProperty("商家后台账号id")
+    private Long backstageUserId;
+
+    @ApiModelProperty("是否为自提点")
+    private Boolean isPoint;
+
+    @ApiModelProperty("默认地址")
+    private ComShopUserAddressVO comShopUserAddressVO;
+
+    @ApiModelProperty("商家id")
+    private Long storeIdId;
 }

--
Gitblit v1.7.1