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

lidongdong

2022-12-06 2a212f983f35e1c569dfec3a172fb5f0c9f85fac

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

@@ -46,11 +46,14 @@
    @ApiModelProperty("商品详情")
    private String details;

    @ApiModelProperty("商品详情()富文本")
    private String goodsDescribe;

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

    @ApiModelProperty("商品规格")
    @Valid