Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

yanghui

2022-12-08 5e7892cd0921111dfbaf84196f2593f8045d1c11

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