From 7e5a51f911b7f65b6c37e232b69dc18c6fb6a066 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 06 十一月 2024 14:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
index 93eac04..69f5465 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
@@ -248,7 +248,7 @@
}
@Override
- public R<Boolean> updateArrivalTime(String orderId, Date arriveTime) {
+ public R<Boolean> updateArrivalTime(String orderId, String arriveTime) {
return null;
}
--
Gitblit v1.7.1