From 76110e19293027965ebade736b3870a6c1888804 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 09 八月 2025 16:18:34 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaitPakinService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaitPakinService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaitPakinService.java
index 485d612..a14d53e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaitPakinService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaitPakinService.java
@@ -10,6 +10,6 @@
     List<WaitPakin> getByOrderDetlId(Long orderDetlId);
 
     //缁勬墭
-    boolean comb(WaitPakin waitPakin);
+    boolean comb(WaitPakin waitPakin, Long inType);
 
 }

--
Gitblit v1.9.1