From 2226679bda25ddf977f12367a9a37fcf4e377249 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 17 六月 2025 11:00:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java b/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java
index 8e600ac..8e44942 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java
@@ -1,14 +1,15 @@
 package cn.lili.modules.lmk.service;
 
+import cn.lili.group.Add;
 import cn.lili.modules.lmk.domain.entity.Video;
 import cn.lili.modules.lmk.domain.form.*;
-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.*;
 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.query.VideoQuery;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+
 import java.util.List;
 
 /**
@@ -123,6 +124,8 @@
      */
     Result recommendVideo(VideoQuery query);
 
+    Result healthRecommendVideo(WxHealthVideoQuery query);
+
     /**
      * 鎵归噺鏇存柊瑙嗛鏀惰棌鏁伴噺
      *
@@ -213,4 +216,25 @@
      * @return
      */
     Result delHealth(String id);
+
+    Result addKitchenVideo( KitchenVideoForm form);
+
+    Result updateKitchenVideo( KitchenVideoForm form);
+    /**
+     * 鍘ㄧ瑙嗛鍒楄〃
+     *
+     * @param query
+     * @return
+     */
+    Result KitchenVideoQuery(KitchenVideoQuery query);
+
+    Result delKitchen(String id);
+
+    /**
+     * 瑙嗛鍟嗗搧鏌ョ湅
+     *
+     * @param videoId
+     * @return
+     */
+    Result getGoodsDetail(String videoId);
 }

--
Gitblit v1.8.0