Merge remote-tracking branch 'origin/master'

CeDo

2021-04-20 38541a4e5731da9f478b50875a1d4cb978b0cfd5

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPageVO.java

@@ -67,7 +67,7 @@
    private List<ComShopOrderGoodsVO> orderGoodsVOList;

    @ApiModelProperty(value = "订单下店铺信息")
    private ComShopStoreVO shopStoreVO;
    private PageShopStoreVO shopStoreVO;

    @ApiModelProperty(value = "用户收货地址id")
    private ComShopUserAddressVO userAddressVO;