From 193945d70b561bc96bb608b47b9b2e4dba3b45b2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 三月 2025 11:40:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java
index 88f8dc3..94db5c6 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java
@@ -41,7 +41,6 @@
      * 新增和更新执行
      */
     @ApiModelProperty(value = "记录修改人,前端忽略")
-    @JsonIgnore
     @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
     private String updateBy;
     /**
@@ -61,7 +60,6 @@
      * 最后修改时间
      */
     @ApiModelProperty(value = "记录修改时间,前端忽略")
-    @JsonIgnore
     @TableField("update_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;

--
Gitblit v1.7.1