From a44c8916586337ea4b7e1faa0c4f622ac3e2784f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 15 四月 2025 15:42:03 +0800
Subject: [PATCH] #优化:物料表导入模版与web端不符合

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
index ab4daa7..932f558 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
@@ -38,7 +38,7 @@
 
     R getDeltByCode(String code);
 
-    WaitPakin mergeItems(WaitPakinParam waitPakin);
+    WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId);
 
     WaitPakin unBind(WaitPakinParam param);
 

--
Gitblit v1.9.1