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

peng

5 天以前 d4d9ea89dd109cb975eaa3412a15c5ff6e8d11dd

 framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java

@@ -114,6 +114,14 @@
    IPage getAuthorCollectVideoPage(IPage page, @Param("query") AuthorVideoQuery query);

    /**
     * 获取视频主页作者点赞的视频分页
     *
     * @param page
     * @param query
     */
    IPage getAuthorLikeVideoPage(IPage page, @Param("query") AuthorVideoQuery query);

    /**
     * 小程序-视频详情
     *
     * @param id