From 7f9fa6378436a22a6b7df8c8ddb3af83f42c7d8b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:11 +0800
Subject: [PATCH] #优化修改 1. 再次收货，先收货30再次收货30累加才对 2. 批次号整个流程走不通 3. 任务工作档排序，最新的永远在最上面

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java |    2 +-
 1 files changed, 1 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 32752f4..f6a22fb 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
@@ -6,7 +6,7 @@
 
 public interface WaitPakinService extends IService<WaitPakin> {
 
-    WaitPakin mergeItems(WaitPakinParam waitPakin);
+    WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId);
 
     WaitPakin unBind(WaitPakinParam param);
 }

--
Gitblit v1.9.1