Merge branch 'master' of http://120.27.238.55:7000/r/xc-video

xiaoyong931011

2021-12-17 7da58964755c5c97fb1bd1f31a11827ff698fa2b

 src/main/java/cc/mrbird/febs/video/mapper/VideoCollectionMapper.java

@@ -14,4 +14,6 @@
    IPage<ApiMyVideoCollectionVo> selectApiVideoCollectionInPage(IPage<ApiMyVideoCollectionVo> page, @Param("record")ApiMyVideoCollectionDto apiMyVideoCollectionDto);

    IPage<ApiMyVideoHistoryVo> selectApiMyVideoHistoryInPage(IPage<ApiMyVideoHistoryVo> page, @Param("record")ApiMyVideoHistoryDto apiMyVideoHistoryDto);

    VideoCollectionEntity selectVideoCollectionByVideoIdAndMemberId(@Param("videoId")Long videoId, @Param("memberId")Long id);
}