Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

huanghongfa

2021-06-07 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2

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

@@ -49,6 +49,12 @@
    @ApiModelProperty("商品详情")
    private String details;

    /**
     * 配送方式（1.商家配送  2.快递物流）
     */
    @ApiModelProperty(value = "配送方式（1.商家配送  2.快递物流）",hidden = true)
    private Integer deliveryType;

    @ApiModelProperty("商品规格")
    @Valid
    private List<AddShopGoodsAttrVO> goodsAttrVOList;