From 6abcd3cdf88694ce20bf802ec6501c1aa1e0df14 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Sat, 12 Oct 2024 14:22:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/OrderService.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index 670dd6f..59c16ba 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -534,8 +534,8 @@ public class OrderService {
         map.put("detailList", dataList);
         map.put("orderInfo", orderInfo);
         map.putAll(BeanUtil.beanToMap(orderVo, false, false));
-        map.put("createAt", DateUtil.formatDate(DateUtil.date(orderInfo.getCreatedAt())));
-        map.put("paidTime", orderInfo.getPaidTime() == null ? null : DateUtil.formatDate(DateUtil.date(orderInfo.getPaidTime())));
+        map.put("createAt", DateUtil.formatDateTime(DateUtil.date(orderInfo.getCreatedAt())));
+        map.put("paidTime", orderInfo.getPaidTime() == null ? null : DateUtil.formatDateTime(DateUtil.date(orderInfo.getPaidTime())));
         return map;
     }
 }