From 6d8a950aa7769b1d26fb86f7453ab450d19096ec Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 05 Mar 2026 10:36:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.24-blue' into 2.24-blue
---
trading-order-admin/src/main/java/com/yami/trading/WebApplication.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/WebApplication.java b/trading-order-admin/src/main/java/com/yami/trading/WebApplication.java
index 7d3e0f9..2e66836 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/WebApplication.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/WebApplication.java
@@ -46,8 +46,8 @@
@PostConstruct
void init() {
// 强制设置默认时区（影响整个JVM）
- TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
- System.setProperty("user.timezone", "Asia/Shanghai");
+ TimeZone.setDefault(TimeZone.getTimeZone("Asia/Tokyo"));
+ System.setProperty("user.timezone", "Asia/Tokyo");
}
@Override
--
Gitblit v1.9.3