From 0d10bc99eec75672b049339399e4f762fbd9746e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 11 九月 2026 11:45:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/domain/VO/DetailTraceDealVO.java | 74 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/VO/DetailTraceDealVO.java b/smartor/src/main/java/com/smartor/domain/VO/DetailTraceDealVO.java
index f1dda53..8fa031d 100644
--- a/smartor/src/main/java/com/smartor/domain/VO/DetailTraceDealVO.java
+++ b/smartor/src/main/java/com/smartor/domain/VO/DetailTraceDealVO.java
@@ -34,7 +34,7 @@
@ApiModelProperty("澶勭悊绉戝鍚嶇О")
@Excel(name = "澶勭悊绉戝鍚嶇О")
private String todeptname;
-
+
/**
* 闂绫诲瀷:璇煶銆侀棶鍗�
*/
@@ -83,5 +83,77 @@
*/
@ApiModelProperty("闂缁村害")
private String dimension;
+
+ @Excel(name = "璐ｄ换绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "璐ｄ换绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String dutyDeptPersonName;
+
+ @Excel(name = "璐ｄ换绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "璐ｄ换绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String dutyDeptPersonCode;
+
+ @Excel(name = "鎶ュ绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "鎶ュ绉戝鍚嶇О锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ private String reportDeptPersonName;
+
+ @Excel(name = "鎶ュ绉戝缂栫爜锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "鎶ュ绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String reportDeptPersonCode;
+
+ /**
+ * 娴佽浆绉戝璐ｄ换浜虹紪鐮� (濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊)
+ */
+ @Excel(name = "娴佽浆绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "娴佽浆绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String circulationDeptPersonCode;
+
+ /**
+ * 娴佽浆绉戝璐ｄ换浜哄悕绉� (濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊)
+ */
+ @Excel(name = "娴佽浆绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "娴佽浆绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String circulationDeptPersonName;
+
+ /**
+ * 娴佽浆绉戝璐ｄ换浜虹紪鐮� (濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊)
+ */
+ @Excel(name = "娴佽浆绉戝缂栫爜锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "娴佽浆绉戝缂栫爜锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ private String circulationDeptCode;
+
+ /**
+ * 娴佽浆绉戝璐ｄ换浜哄悕绉� (濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊)
+ */
+ @Excel(name = "娴佽浆绉戝鍚嶇О锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "娴佽浆绉戝鍚嶇О锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ private String circulationDeptName;
+
+ /**
+ * 娴佽浆绉戝璐ｄ换浜哄悕绉� (濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊)
+ */
+ @Excel(name = "娴佽浆璇存槑")
+ @ApiModelProperty(value = "娴佽浆璇存槑")
+ private String circulationExplain;
+ /**
+ * 娴佽浆绉戝璐ｄ换浜哄悕绉� (濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊)
+ */
+ @Excel(name = "娴佽浆鏃堕棿")
+ @ApiModelProperty(value = "娴佽浆鏃堕棿")
+ private Date circulationTime;
+
+ /**
+ * 娴佽浆鐘舵�侊細0涓嶆祦杞紙榛樿锛� 1娴佽浆
+ */
+ @Excel(name = "娴佽浆鐘舵�侊細0涓嶆祦杞紙榛樿锛� 1娴佽浆")
+ @ApiModelProperty(value = "娴佽浆鐘舵�侊細0涓嶆祦杞紙榛樿锛� 1娴佽浆")
+ private Integer circulationStatus;
+
+ @Excel(name = "娴佽浆浜哄鍚�")
+ @ApiModelProperty(value = "娴佽浆浜哄鍚�")
+ private String circulationPersonName;
+
+ @Excel(name = "娴佽浆浜虹紪鐮�")
+ @ApiModelProperty(value = "娴佽浆浜虹紪鐮�")
+ private String circulationPersonCode;
}
--
Gitblit v1.9.3