From 352ed0e639c084e257914bcd8b78169f09e51985 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 28 二月 2026 21:29:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrderPayment.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrderPayment.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrderPayment.java
index 857b54d..af1caaf 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrderPayment.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrderPayment.java
@@ -6,6 +6,7 @@
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -58,9 +59,11 @@
     private String paymentFailReason;
 
     @ApiModelProperty(value = "支付发起时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime paymentInitiationTime;
 
     @ApiModelProperty(value = "支付完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime paymentCompletionTime;
 
     @ApiModelProperty(value = "是否有退款(0=否,1=是)")
@@ -76,9 +79,11 @@
     private String refundFailReason;
 
     @ApiModelProperty(value = "退款发起时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime refundInitiationTime;
 
     @ApiModelProperty(value = "退款完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime refundCompletionTime;
 
 

--
Gitblit v1.7.1