Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianH...

luodangjia

2025-01-08 d34b3987a7c89c29a74eb7d3525b2a486eeaca10

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java

@@ -427,5 +427,5 @@
                      @RequestParam("pageNum") Integer pageNum,
                      @RequestParam("pageSize") Integer pageSize);
    @GetMapping(value = "/order/updateArrivalTime")
    R<Boolean> updateArrivalTime(@RequestParam("orderId")String orderId,@RequestParam("arriveTime")Date arriveTime);
    R<Boolean> updateArrivalTime(@RequestParam("orderId")String orderId,@RequestParam("arriveTime")String arriveTime);
}