Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-28 11b718b78ee92d2349072c972e7155001693d69e

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