Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-06 d6ef18f23c4b298cb9b977ab3a5d65e2f4a39fe2

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