From da0fd7be060ab4a0225c70c6572b2947484a2cb1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 31 十月 2025 09:13:13 +0800
Subject: [PATCH] Merge branch 'devlop' into devlop_whxrwms

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java
index 27db0c7..2df66e4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java
@@ -1,8 +1,11 @@
 package com.vincent.rsf.server.manager.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.framework.common.R;
 import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
 import com.vincent.rsf.server.manager.entity.WaitPakin;
+
+import java.util.List;
 
 public interface WaitPakinService extends IService<WaitPakin> {
 
@@ -10,5 +13,5 @@
 
     WaitPakin unBind(WaitPakinParam param);
 
-    WaitPakin mergeMatnrItems(WaitPakinParam waitPakin, Long userId);
+    R removePakin(List<Long> list);
 }

--
Gitblit v1.9.1