From b42b180f5c2bc89e494b2274d8d454a4bd6dbf9c Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 21 三月 2025 17:27:59 +0800
Subject: [PATCH] art: 系统管理-用户管理-添加选择设备，并根据是否有设备管理模块功能区分加载 哪个模块的设备倏
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java
index 417ec66..280bfce 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java
@@ -42,12 +42,12 @@
@TableField(value = "update_time", fill = FieldFill.UPDATE)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date updateTime;
- @TableField(value = "create_user",fill = FieldFill.INSERT)
- @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
- private String createUser;
- @TableField(value = "update_user", fill = FieldFill.UPDATE)
- @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
- private String updateUser;
+ @TableField(value = "create_by",fill = FieldFill.INSERT)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String createBy;
+ @TableField(value = "update_by", fill = FieldFill.UPDATE)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
@@ -59,6 +59,7 @@
@Dict(dicCode = "dnc_pull_status")
private Integer pullStatus;
@TableField(exist = false)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String pullUser;
@TableField(exist = false)
private Integer attributionType;
--
Gitblit v1.9.3