Merge remote-tracking branch 'origin/master'

xuhy

2025-01-15 94ae02e6f73b7011f0fcf6acff8636341d35351d

 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;
            }