Merge remote-tracking branch 'origin/master'

CeDo

2021-04-22 be2d7ec232fbd22b5e46ec133485ea751520636d

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

@@ -19,7 +19,7 @@
    private Long storeId;


    @ApiModelProperty("店铺名称")
    @ApiModelProperty("商品名称")
    private String name;

    @ApiModelProperty("商品现价")
@@ -36,8 +36,8 @@
    @ApiModelProperty("商品主图")
    private String goodsPic;

    @ApiModelProperty("商品描述")
    private String goodsDescribe;
    @ApiModelProperty("商品详情")
    private String details;

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