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

无关风月

2025-08-26 960380f89c9371ba309d6c50b1ab1b677ea74575

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java

@@ -314,7 +314,7 @@
            throw new ServiceException(e.getMessage());
        }
        if(!result.isEmpty()){
            return R.fail(result);
            return R.fail(result.toString());
        }
        return R.ok();
    }