Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-26 8b94c462ae127795cfa4a0495c723ca9b7041e10

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/AccountingStrategyFallbackFactory.java

@@ -25,7 +25,7 @@
         
         @Override
         public R<TAccountingStrategy> getAccountingStrategyById(Integer id) {
            throw new RuntimeException("根据id查询计费策略失败：" + throwable.getMessage());
            return R.fail("根据id查询计费策略失败：" + throwable.getMessage());
         }
      };
   }