Merge remote-tracking branch 'origin/dev' into dev

xuhy

2025-06-09 f18b35727a11a5f8b5e326f6045f49b571954ba3

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ExchangeOrderFallbackFactory.java

@@ -30,7 +30,7 @@

            @Override
            public R<TExchangeOrder> orderDetail(Long orderId) {
                return null;
                return R.fail("获取数据失败：" + cause.getMessage());
            }
        };
    }