From 30b41cc526165b70e04a1fe1438cb79bb035a7bf Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 13 六月 2025 11:08:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java b/framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java
index cbb9fe8..19e10ae 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java
@@ -2,18 +2,19 @@
 
 import cn.lili.modules.lmk.domain.entity.Video;
 import cn.lili.modules.lmk.domain.query.AuthorVideoQuery;
+import cn.lili.modules.lmk.domain.query.HealthVideoQuery;
 import cn.lili.modules.lmk.domain.query.ManagerVideoQuery;
+import cn.lili.modules.lmk.domain.query.VideoQuery;
 import cn.lili.modules.lmk.domain.vo.CollectTypeNumVO;
 import cn.lili.modules.lmk.domain.vo.VideoAccountVO;
-import cn.lili.modules.lmk.domain.vo.WxVideoVO;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.lili.modules.lmk.domain.vo.VideoVO;
-import cn.lili.modules.lmk.domain.form.VideoForm;
-import cn.lili.modules.lmk.domain.query.VideoQuery;
-import java.util.List;
+import cn.lili.modules.lmk.domain.vo.WxEditVideoVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 瑙嗛鍐呭 Mapper 鎺ュ彛
@@ -49,7 +50,7 @@
      *
      * @return
      */
-    IPage recommendVideo(IPage page);
+    IPage recommendVideo(IPage page, @Param("query") VideoQuery query);
 
     /**
      * 鎵归噺鏇存柊瑙嗛鏀惰棌鏁伴噺
@@ -104,4 +105,20 @@
      * @param query
      */
     IPage getAuthorCollectVideoPage(IPage page, @Param("query") AuthorVideoQuery query);
+
+    /**
+     * 灏忕▼搴�-瑙嗛璇︽儏
+     *
+     * @param id
+     * @return
+     */
+    WxEditVideoVO wxDetail(@Param("id") String id);
+
+    /**
+     * 澶у仴搴疯棰戝垎椤�
+     *
+     * @param page
+     * @param query
+     */
+    IPage healthPage(IPage page, @Param("query") HealthVideoQuery query);
 }

--
Gitblit v1.8.0