From cf985b57d178fad1e18b46b9b020548a90d3d915 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 28 十一月 2022 11:17:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 11 +++++++++++
1 files changed, 11 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 4436b9c..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,7 @@
private Long bindingCheckUnitId;
+ @ApiModelProperty("后台账号类型")
private Integer backstageType;
@@ -256,4 +258,13 @@
@ApiModelProperty("物业公司id")
private Long propertyId;
+
+ @ApiModelProperty("商家后台账号id")
+ private Long backstageUserId;
+
+ @ApiModelProperty("是否为自提点")
+ private Boolean isPoint;
+
+ @ApiModelProperty("默认地址")
+ private ComShopUserAddressVO comShopUserAddressVO;
}
--
Gitblit v1.7.1