From be0589d61b2d13a12e0dc0f43591175bcae1261e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 10:19:07 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveService.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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..c9cc4f7 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,17 +3,29 @@
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> {
/**
+ * @param
+ * @param loginUserId
+ * @return
* @author Ryan
* @description 娉㈡浠诲姟涓嬪彂
- * @param
- * @return
* @time 2025/4/25 16:24
*/
- R publicTask(Map<String, Object> map);
+ R publicTask(Map<String, Object> map, Long loginUserId);
+
+ /**
+ * @author Ryan
+ * @description 棰勮娉㈡涓嬪彂浠诲姟
+ * @param
+ * @return
+ * @time 2025/4/27 11:08
+ */
+ List<WaveItem> mergeWavePreview(Long waveId);
}
--
Gitblit v1.9.1