[feat]解决合并冲突问题

ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/VlogService.java

@@ -26,11 +26,6 @@ public interface VlogService extends IService<Vlog> {
      */
     public void createVlog(VlogBO vlogBO);
 
-    /**
-      * 查询首页/搜索的vlog列表
-      */
-    public Page<IndexVlogVO> getIndexVlogList(IndexListBO bo, Page page);
-
     /**
      * 根据视频主键查询vlog
      */

ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java

@@ -144,11 +144,6 @@ public class VlogServiceImpl extends ServiceImpl<VlogMapper, Vlog> implements Vl
         vlogMapper.insert(vlog);
     }
 
-    @Override
-    public Page<IndexVlogVO> getIndexVlogList(IndexListBO bo, Page page) {
-        return null;
-    }
-
 
     @Override
     public Integer getVlogBeLikedCounts(String vlogId) {