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

peng

2 天以前 803a61d1d89e75f0b5d72785069b3dceb579f3ca

 framework/src/main/java/cn/lili/modules/lmk/domain/vo/VideoGoodsPublishVO.java

@@ -15,6 +15,9 @@
    @ApiModelProperty("商品id")
    private String goodsId;

    @ApiModelProperty("sku")
    private String goodsSkuId;

    @ApiModelProperty("商品数量")
    private Integer goodsNum;