From 4a2408cf21e1c60196d798ab971f00328d9ca249 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 18 四月 2025 16:20:02 +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/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