From 3a386441ce85c60b6ff2587d2e8e6371e3c8a3ca Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 02 二月 2026 17:31:25 +0800
Subject: [PATCH] 光电站点改为智能站点

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java |    1 +
 1 files changed, 1 insertions(+), 0 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 87bd8d3..5101ef4 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
@@ -11,6 +11,7 @@
 
     WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId);
     WaitPakin mergeItemsWcs(WaitPakinParam waitPakin, Long userId);
+    boolean mergeItemsCheck(WaitPakinParam waitPakin, Long userId);
 
     WaitPakin unBind(WaitPakinParam param);
 

--
Gitblit v1.9.1