From 221b72ce4da14b97dc5aa5afe43eae2c68fb88b0 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 18 七月 2025 20:53:21 +0800
Subject: [PATCH] Merge branch 'huliguo' of http://120.76.84.145:10101/gitblit/r/java/ZhengShengXinAdmin into huliguo

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/Qichacha.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Qichacha.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Qichacha.java
index 048be72..c196e80 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Qichacha.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Qichacha.java
@@ -1,9 +1,12 @@
 package com.ruoyi.system.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -21,5 +24,6 @@
 
     @TableField(value = "time")
     @ApiModelProperty(value = "调用时间")
-    private Date time;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime time;
 }
\ No newline at end of file

--
Gitblit v1.7.1