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

peng

5 天以前 6d95ff17f7d0de0b3efafe033ba1e3b4487d4f2e

 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;