From 134f5b1aedeb90b9f7a71dc41e8f08e96bcb3f85 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期二, 29 七月 2025 11:46:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/mapper/MyCollectMapper.java |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/mapper/MyCollectMapper.java b/framework/src/main/java/cn/lili/modules/lmk/mapper/MyCollectMapper.java
index 4583073..23ac9b9 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/mapper/MyCollectMapper.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/mapper/MyCollectMapper.java
@@ -40,12 +40,11 @@
     List<SimpleMyCollectVO> getCollectsByVideoIds(@Param("videoIds") List<String> videoIds, @Param("userId") String currentUserId);
 
     /**
-     * 鏍规嵁鏌愭敹钘忕被鍨媔d鍒嗙粍缁熻鏁伴噺锛屾瘮濡傦細缁熻姣忎釜瑙嗛鐨勬敹钘忔暟
+     * 鏍规嵁瑙嗛钘忕被鍨媔d鍒嗙粍缁熻鏁伴噺锛屾瘮濡傦細缁熻姣忎釜瑙嗛鐨勬敹钘忔暟
      *
-     * @param type
      * @return
      */
-    List<CollectTypeNumVO> countNumGroupByType(@Param("type") String type);
+    List<CollectTypeNumVO> countNumGroupByVideo();
 
 
     /**
@@ -63,14 +62,6 @@
      * @return
      */
     IPage getStoreCollectPage(IPage page,@Param("userId")String userId);
-
-    /**
-     * 鑾峰緱鎴戠殑鏀惰棌 瑙嗛
-     * @param page
-     * @param userId
-     * @return
-     */
-    IPage getVideoCollectPage(IPage page,@Param("userId")String userId);
 
     IPage getGoodsCollectPage(IPage page,@Param("userId")String type);
 }

--
Gitblit v1.8.0