Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-11-28 9109a60d73507e411020c32c8f66fb5ba6fef80c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -267,4 +267,7 @@

    @ApiModelProperty("默认地址")
    private ComShopUserAddressVO comShopUserAddressVO;

    @ApiModelProperty("商家id")
    private Long storeIdId;
}