Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 1daff9a8151820980da082ece4c923f946ff8028

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