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

peng

5 天以前 aac2321d1cf5536f7ea03f30d55a4aba30fbf710

 framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java

@@ -165,6 +165,14 @@
    Result getAuthorCollectVideoPage(AuthorVideoQuery query);

    /**
     * 获取视频主页作者点赞视频分页
     *
     * @param query
     * @return
     */
    Result getAuthorLikeVideoPage(AuthorVideoQuery query);

    /**
     * 保存视频主页的个人信息修改
     *
     * @param form
@@ -281,4 +289,5 @@
     * @param numList
     */
    void updateThumbsUpNumBatch(List<CollectTypeNumVO> numList);

}