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

peng

6 天以前 745af316b6f14cc97f6cb64d56eda4cb68960c3e

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

@@ -73,7 +73,7 @@

    /** 商品信息 */
    @ApiModelProperty("商品信息")
    private VideoGoodsVO goods;
    private List<VideoGoodsDetailVO> goodsList;

    @ApiModelProperty("当前用户是否收藏了该视频")
    private Boolean collected = Boolean.FALSE;