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

peng

7 天以前 3fdc508014c167ee5b1e4afca62fee7fb87b62e9

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

@@ -85,6 +85,8 @@
     */
    VideoAccountVO getAuthorInfo(@Param("authorId") String authorId, @Param("currentUserId") String currentUserId);

    VideoAccountVO getAuthorInfoAdmin(@Param("authorId") String authorId, @Param("currentUserId") String currentUserId);

    /**
     * 获取作者的所有视频id
     *