From a6dd30e8bfffa5057e929cf355fbfdb860e70d2c Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 20 五月 2025 13:47:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocRelative.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocRelative.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocRelative.java
index 7118a96..7ab9ee7 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocRelative.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocRelative.java
@@ -28,11 +28,11 @@
     @TableField(value = "update_time", select = false, fill = FieldFill.UPDATE)
     private Date updateTime;
     @JsonIgnore
-    @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
-    private String createUser;
+    @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+    private String createBy;
     @JsonIgnore
-    @TableField(value = "update_user", select = false, fill = FieldFill.UPDATE)
-    private String updateUser;
+    @TableField(value = "update_by", select = false, fill = FieldFill.UPDATE)
+    private String updateBy;
     @JsonIgnore
     @TableLogic
     @TableField(value = "delete_flag", select = false)

--
Gitblit v1.9.3