From 7c77e020b81e42fb65aa966742ff7c93e73668e1 Mon Sep 17 00:00:00 2001 From: cuikaidong <ckd2942379034@163.com> Date: 星期一, 26 五月 2025 17:57:55 +0800 Subject: [PATCH] 设备调拨功能增加 --- lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsInfo.java | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsInfo.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsInfo.java index 2cd51e1..922814b 100644 --- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsInfo.java +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsInfo.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import lombok.NoArgsConstructor; +import org.jeecg.common.aspect.annotation.Dict; import java.math.BigDecimal; import java.util.Date; @@ -41,7 +42,7 @@ @TableField(value = "process_type") private Integer processType; @TableField(value = "structure_type") - private Integer structureType; + private String structureType; @TableField(value = "parts_code") private String partsCode; @TableField(value = "parts_status") @@ -54,12 +55,18 @@ @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