From 0ca3a3922d2d25df52682b2290be15135cce100e Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期二, 29 九月 2026 17:56:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.3' into 2.3
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TCardChargingOrderController.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TCardChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TCardChargingOrderController.java
index 54aedd2..30c0077 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TCardChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TCardChargingOrderController.java
@@ -65,6 +65,7 @@
BeanUtils.copyProperties(order, export);
export.setStartTime(formatTime(order.getStartTime()));
export.setEndTime(formatTime(order.getEndTime()));
+ export.setMaxEndTime(formatTime(order.getMaxEndTime()));
exports.add(export);
}
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), CardChargingOrderExport.class, exports);
--
Gitblit v1.7.1