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/operation/XpBanner.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpBanner.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpBanner.java
index 81c7a09..04b2068 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpBanner.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpBanner.java
@@ -35,12 +35,12 @@
 
     @ApiModelProperty(value = "广告开始时间")
     @TableField("start_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
 
     @ApiModelProperty(value = "广告结束时间")
     @TableField("end_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
     @ApiModelProperty(value = "状态(0=未开始,1=进行中,2=已结束)")

--
Gitblit v1.7.1