From f0c023166c7a2855c93c5cacd3267cfee6077322 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 01 九月 2025 10:46:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java |   17 +++++++++++++++--
 1 files changed, 15 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 94db5c6..3c572e0 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
@@ -33,7 +33,6 @@
      * 新增执行
      */
     @ApiModelProperty(value = "记录创建人,前端忽略")
-    @JsonIgnore
     @TableField(value = "create_by", fill = FieldFill.INSERT)
     private String createBy;
 
@@ -63,7 +62,13 @@
     @TableField("update_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
-
+    /**
+     * 新增执行
+     */
+    @ApiModelProperty(value = "记录创建人id,前端忽略")
+    @JsonIgnore
+    @TableField(value = "create_id", fill = FieldFill.INSERT)
+    private String createId;
 
     public String getCreateBy() {
         return createBy;
@@ -104,4 +109,12 @@
     public void setUpdateTime(LocalDateTime updateTime) {
         this.updateTime = updateTime;
     }
+
+    public String getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(String createId) {
+        this.createId = createId;
+    }
 }

--
Gitblit v1.7.1