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 | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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 4e1daf9..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,10 +60,9 @@
* 最后修改时间
*/
@ApiModelProperty(value = "记录修改时间，前端忽略")
- @JsonIgnore
- @TableField("last_time")
+ @TableField("update_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime lastTime;
+ private LocalDateTime updateTime;
public String getCreateBy() {
@@ -99,11 +97,11 @@
this.createTime = createTime;
}
- public LocalDateTime getLastTime() {
- return lastTime;
+ public LocalDateTime getUpdateTime() {
+ return updateTime;
}
- public void setLastTime(LocalDateTime lastTime) {
- this.lastTime = lastTime;
+ public void setUpdateTime(LocalDateTime updateTime) {
+ this.updateTime = updateTime;
}
}
--
Gitblit v1.7.1