From 9acb17a6871d84a85c373eb90b980f98894e30e0 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期二, 18 二月 2025 17:58:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java index 79d6e53..3fe9889 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestParam; import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -425,5 +426,6 @@ R<String> oldData(@RequestParam("index") Integer index, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize); - + @GetMapping(value = "/order/updateArrivalTime") + R<Boolean> updateArrivalTime(@RequestParam("orderId")String orderId,@RequestParam("arriveTime")String arriveTime); } -- Gitblit v1.7.1