From f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:16:02 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/service/OrderService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index e48f8b2..97876c7 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -14,10 +14,10 @@
boolean updateSettle(Long orderId, Long settle, Long userId);
- boolean updateSettle2(Long orderId, Long settle, Integer pltType);
+ boolean updateSettle2(Long orderId, Long settle, Integer pltType,String inTime);
- void checkComplete(String orderNo, String locNo);
+ void checkComplete(String orderNo, Integer pltType);
boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
--
Gitblit v1.9.1