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/ComponentInfo.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentInfo.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentInfo.java index c1362bb..f5615b1 100644 --- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentInfo.java +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentInfo.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.NoArgsConstructor; +import org.jeecg.common.aspect.annotation.Dict; import java.math.BigDecimal; import java.util.Date; @@ -59,12 +60,19 @@ @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) - private String createUser; - @TableField(value = "update_user", fill = FieldFill.UPDATE) - 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) private Integer deleteFlag = 0; + + //鍒涘缓浜� + private transient String createName; + //鏇存柊浜� + private transient String updateName; } -- Gitblit v1.9.3