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 |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 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 280bfce..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")
@@ -62,14 +64,32 @@
     @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