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

zxl

6 天以前 1c7c1366a88bcb056a0e0bc5e0e2dfe8470b4be2

 framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoQuery.java

@@ -28,10 +28,10 @@
    @ApiModelProperty("视频来源：recommend推荐、author某作者的视频、collect某作者收藏的视频、like某作者点赞的视频、search搜索、goodsSimilarly查挂同一商品的视频")
    private String videoFrom;

    @ApiModelProperty("视频id")
    private String videoId;




    
    /**
     * @see cn.lili.modules.lmk.enums.general.VideoTypeEnum
     */