Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-29 278f61f89b8282784c6f3572605ef5e62dc74f59

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

@@ -42,7 +42,7 @@
         
         @Override
         public R<List<TAccountingStrategyDetail>> getListByAccountingStrategyId(Integer id) {
            throw new RuntimeException("根据计费策略主表id策略明细失败：" + throwable.getMessage());
            return R.fail("根据计费策略主表id策略明细失败：" + throwable.getMessage());
         }

         @Override