From 88bd75d93f86d3cf4f12e652d459da8bae71e545 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 15:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/service/MyCollectService.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/MyCollectService.java b/framework/src/main/java/cn/lili/modules/lmk/service/MyCollectService.java
index 5ee9d89..29010ac 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/MyCollectService.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/MyCollectService.java
@@ -2,11 +2,11 @@
 
 import cn.lili.modules.lmk.domain.entity.MyCollect;
 import cn.lili.modules.lmk.domain.vo.SimpleMyCollectVO;
+import cn.lili.modules.lmk.domain.vo.CollectTypeNumVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import cn.lili.base.Result;
 import cn.lili.modules.lmk.domain.form.MyCollectForm;
 import cn.lili.modules.lmk.domain.query.MyCollectQuery;
-import org.springframework.beans.PropertyValues;
 
 import java.util.List;
 
@@ -73,4 +73,13 @@
      * @return
      */
     List<SimpleMyCollectVO> getCollectsByVideoIds(List<String> videoIds);
+
+    /**
+     * 鏍规嵁鏌愭敹钘忕被鍨媔d鍒嗙粍缁熻鏁伴噺锛屾瘮濡傦細缁熻姣忎釜瑙嗛鐨勬敹钘忔暟
+     * @param type
+     * @return
+     */
+    List<CollectTypeNumVO> countNumGroupByType(String type);
+
+    Result getMyCollectList(MyCollectQuery query);
 }

--
Gitblit v1.8.0