Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-11 8ef73a8875b9b618e471aafc383f85ba6ab7a154

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java

@@ -109,7 +109,7 @@
            }

            @Override
            public R<SettlementTotalVO> settlementTotalR(String time) {
            public R<SettlementTotalVO> settlementTotalR(String time,Long userId) {
                return R.fail("查询结算汇总表导出列表失败:" + throwable.getMessage());
            }