Merge remote-tracking branch 'origin/master'

xuhy

2024-09-13 cb02f43ad81fd2ce3e1c3e0cd95234746b7927ad

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/IntegrationFallbackFactory.java

@@ -48,10 +48,10 @@
                return R.fail("读取实时监测数据调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> endCharge(EndCharge endCharge) {
                return R.fail("充电结束调用失败：" + throwable.getMessage());
            }
//            @Override
//            public R<String> endCharge(EndCharge endCharge) {
//                return R.fail("充电结束调用失败：" + throwable.getMessage());
//            }

            @Override
            public R<String> platformConfirmationCharging(PlatformConfirmationCharging platformConfirmationCharging) {