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

lidongdong

2022-12-08 284a4b9bda8f7c09f550c15e71ced282e5531a08

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