From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/service/OrderService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index e56af79..97876c7 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -14,7 +14,7 @@
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, Integer pltType);
--
Gitblit v1.9.1