From c1023206d3207bf9520e99c2f0f4549d8eb61ddc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 26 十月 2024 16:28:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index 4d6a7b9..b5f7dd1 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -100,7 +100,7 @@
     public void export(@RequestBody ChargingListQuery dto) {
         ChargingOrderTimeVO res = chargingOrderService.chargingList(dto);
         List<TChargingOrderExport> tChargingOrderExports = new ArrayList<>();
-        List<ChargingOrderListVO> exportList = res.getExportList();
+        List<ChargingOrderListVO> exportList = res.getList().getRecords();
         int i = 0;
         for (ChargingOrderListVO chargingOrderListVO : exportList) {
             TChargingOrderExport tChargingOrderExport = new TChargingOrderExport();

--
Gitblit v1.7.1