From 0bb2af72f1feb0de80dda046713045bc81949eab Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 二月 2026 14:36:10 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

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

diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingPileInfoController.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingPileInfoController.java
index f57d3c7..e85a976 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingPileInfoController.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingPileInfoController.java
@@ -154,8 +154,8 @@
             chargingOrder.setOrderAmount(new BigDecimal(chargeOrder.getTotalMoney()));
             chargingOrder.setResidualAmount(BigDecimal.ZERO);
             chargingOrder.setPaymentAmount(new BigDecimal(chargeOrder.getTotalMoney()));
-            chargingOrder.setPayTime(DateUtils.stringToLocalDateTime(chargeOrder.getStartTime()));
-            chargingOrder.setCreateTime(DateUtils.stringToLocalDateTime(chargeOrder.getStartTime()));
+            chargingOrder.setPayTime(chargingOrder.getStartTime());
+            chargingOrder.setCreateTime(chargingOrder.getStartTime());
             if (!StringUtils.hasLength(chargeOrder.getConnectorID())){
                 continue;
             }

--
Gitblit v1.7.1