From 9fd7fc6030525d735144303380d302ba89b712da Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Sun, 3 Aug 2025 22:56:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=96=E8=BD=A6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/sczx/order/dto/OrderDetailDTO.java | 6 ++++++
 src/main/java/com/sczx/order/po/OrderMainPO.java     | 7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/sczx/order/dto/OrderDetailDTO.java b/src/main/java/com/sczx/order/dto/OrderDetailDTO.java
index 4204699..ec94c10 100644
--- a/src/main/java/com/sczx/order/dto/OrderDetailDTO.java
+++ b/src/main/java/com/sczx/order/dto/OrderDetailDTO.java
@@ -71,6 +71,10 @@ public class OrderDetailDTO {
     @ApiModelProperty("首次下单时间")
     private LocalDateTime firstOrderTime;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("取车时间")
+    private LocalDateTime pickCarTime;
+
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("开始计费时间")
     private LocalDateTime startRentTime;
@@ -79,9 +83,11 @@ public class OrderDetailDTO {
     @ApiModelProperty("预计还车时间")
     private LocalDateTime endRentTime;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("申请还车时间")
     private LocalDateTime reqEndRentTime;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("实际还车时间")
     private LocalDateTime actEndRentTime;
 
diff --git a/src/main/java/com/sczx/order/po/OrderMainPO.java b/src/main/java/com/sczx/order/po/OrderMainPO.java
index 650ed0a..ad36c44 100644
--- a/src/main/java/com/sczx/order/po/OrderMainPO.java
+++ b/src/main/java/com/sczx/order/po/OrderMainPO.java
@@ -91,18 +91,17 @@ public class OrderMainPO implements Serializable {
     @ApiModelProperty("首次下单时间")
     private LocalDateTime firstOrderTime;
 
-
+    @ApiModelProperty("取车时间")
+    private LocalDateTime pickCarTime;
 
     @ApiModelProperty("开始计费时间")
     private LocalDateTime startRentTime;
 
 
-
-    @ApiModelProperty("还车时间")
+    @ApiModelProperty("预计还车时间")
     private LocalDateTime endRentTime;
 
 
-
     @ApiModelProperty("申请还车时间")
     private LocalDateTime reqEndRentTime;