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

CeDo

2021-05-13 a225b159a5ea61c6fb0a46f5ff9d2e6862cd7706

 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;