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-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java b/trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java
index 9ca13cf..a99555f 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java
@@ -45,7 +45,7 @@
@ApiModelProperty("中签时间")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "Asia/Tokyo")
private Date endTime;
@ApiModelProperty("备注")
--
Gitblit v1.9.3