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

zxl

6 天以前 3fdceb6011f62d5d2a9d26f5f840f75055506226

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

@@ -195,4 +195,9 @@
     * @return
     */
    IPage getHistoryPage(IPage page, @Param("query") VideoHistoryQuery query);


    VideoUserBaseInfo getVideoSysUserBaseInfo(@Param("id") String id);

    VideoUserBaseInfo getVideoMemUserBaseInfo(@Param("id") String id);
}