Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-26 8da7ca5f5a5466c76b0d0abe23c7935e13e09136

 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;
}