From ec1bf4658e36a17f971a54007920a44c5378b7dc Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 16 六月 2025 10:41:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 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..92c381e 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
@@ -18,7 +18,6 @@
public class DocInfo {
@TableId(value = "doc_id")
private String docId;
-
@TableField(value = "doc_name")
private String docName;
@TableField(value = "doc_alias")
@@ -30,6 +29,9 @@
@TableField(value = "doc_status")
@Dict(dicCode = "dnc_product_status")
private Integer docStatus;
+ @TableField(value = "doc_dispatch_status")
+ @Dict(dicCode = "nc_doc_dispatch_status")
+ private Integer docDispatchStatus;
@TableField(value = "publish_file_id")
private String publishFileId;
@TableField(value = "publish_version")
@@ -42,12 +44,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,16 +61,35 @@
@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)
+ @Dict(dicCode = "nc_doc_relative_attribution_type")
private Integer attributionType;
@TableField(exist = false)
private String attributionId;
@TableField(exist = false)
+ @Dict(dictTable = "nc_doc_classification", dicCode = "classification_id", dicText = "classification_code")
private String classificationId;
//鍚屾鐘舵�� 1 鏈悓姝� 2 宸插悓姝�
@TableField(exist = false)
@Dict(dicCode = "dnc_doc_sync_status")
private Integer syncStatus;
+ //鎵�灞炶妭鐐瑰悕绉�
+ @TableField(exist = false)
+ private String nodeName;
+ //鎵�灞炶妭鐐逛唬鍙�
+ @TableField(exist = false)
+ private String nodeCode;
+ //鎵�灞炶妭鐐筰d
+ @TableField(exist = false)
+ private String nodeId;
+ //璁惧绫诲悕绉�
+ @TableField(exist = false)
+ private String deviceName;
+ //璁惧绫诲垎绾�
+ @TableField(exist = false)
+ private String deviceCode;
+
}
--
Gitblit v1.9.3