From b69b63a09089566b0b2505fbc39a673c3e18785f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 28 四月 2025 11:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveService.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveService.java
index b38ff1e..e6648c9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveService.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.manager.entity.Wave;
+import com.vincent.rsf.server.manager.entity.WaveItem;
+import java.util.List;
import java.util.Map;
public interface WaveService extends IService<Wave> {
@@ -16,4 +18,13 @@
* @time 2025/4/25 16:24
*/
R publicTask(Map<String, Object> map);
+
+ /**
+ * @author Ryan
+ * @description 棰勮娉㈡涓嬪彂浠诲姟
+ * @param
+ * @return
+ * @time 2025/4/27 11:08
+ */
+ List<WaveItem> mergeWavePreview(Long waveId);
}
--
Gitblit v1.9.1