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-common/src/main/java/com/yami/trading/common/domain/BaseEntity.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/trading-order-common/src/main/java/com/yami/trading/common/domain/BaseEntity.java b/trading-order-common/src/main/java/com/yami/trading/common/domain/BaseEntity.java
index 814d38a..21a480f 100644
--- a/trading-order-common/src/main/java/com/yami/trading/common/domain/BaseEntity.java
+++ b/trading-order-common/src/main/java/com/yami/trading/common/domain/BaseEntity.java
@@ -1,6 +1,7 @@
package com.yami.trading.common.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,6 +21,7 @@
/**
* 创建日期
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Tokyo")
@TableField(fill = FieldFill.INSERT)
private Date createTime;
/**
@@ -36,6 +38,7 @@
/**
* 更新日期
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Tokyo")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
--
Gitblit v1.9.3