From 935b27a40c549f3ebc15e7e9654cdfd01e8eab13 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 04 Jun 2024 11:02:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zyqs-0502' into zyqs-0502

---
 src/main/java/com/nq/pojo/MoneyLog.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nq/pojo/MoneyLog.java b/src/main/java/com/nq/pojo/MoneyLog.java
index cb30c05..162a90d 100644
--- a/src/main/java/com/nq/pojo/MoneyLog.java
+++ b/src/main/java/com/nq/pojo/MoneyLog.java
@@ -2,7 +2,10 @@
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+
+import java.util.Date;
 
 @Data
 public class MoneyLog {
@@ -18,6 +21,8 @@
     private String userId;
 
     private String symbol;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
 
 
 }

--
Gitblit v1.9.3