From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 jnpf-flowable/jnpf-flowable-entity/src/main/java/jnpf/flowable/model/record/ProgressModel.java |   88 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 88 insertions(+), 0 deletions(-)

diff --git a/jnpf-flowable/jnpf-flowable-entity/src/main/java/jnpf/flowable/model/record/ProgressModel.java b/jnpf-flowable/jnpf-flowable-entity/src/main/java/jnpf/flowable/model/record/ProgressModel.java
new file mode 100644
index 0000000..80cd975
--- /dev/null
+++ b/jnpf-flowable/jnpf-flowable-entity/src/main/java/jnpf/flowable/model/record/ProgressModel.java
@@ -0,0 +1,88 @@
+package jnpf.flowable.model.record;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 绫荤殑鎻忚堪
+ *
+ * @author JNPF@YinMai Info. Co., Ltd
+ * @version 5.0.x
+ * @since 2024/6/18 17:09
+ */
+@Data
+public class ProgressModel implements Serializable {
+    /**
+     * 涓婚敭
+     */
+    private String id;
+    /**
+     * 寮�濮嬫椂闂�
+     */
+    private Long startTime;
+    /**
+     * 鑺傜偣id
+     */
+    private String nodeId;
+    /**
+     * 鑺傜偣缂栫爜
+     */
+    private String nodeCode;
+    /**
+     * 鑺傜偣鍚嶇О
+     */
+    private String nodeName;
+    /**
+     * 鑺傜偣绫诲瀷
+     */
+    private String nodeType;
+    /**
+     * 鑺傜偣鐘舵�侊紝 1-宸叉彁浜� 2-宸查�氳繃 3-宸叉嫆缁� 4-瀹℃壒涓�.  7绛夊緟涓��8寰呭姙鐞�
+     */
+    private Integer nodeStatus;
+    /**
+     * 瀹℃壒绫诲瀷锛�0锛氭垨绛� 1锛氫細绛� 2锛氫緷娆″鎵癸級
+     */
+    private Integer counterSign;
+    /**
+     * 瀹℃壒浜�
+     */
+    private List<UserItem> approver = new ArrayList<>();
+    /**
+     * 瀹℃壒浜烘暟
+     */
+    private Integer approverCount = 0;
+    /**
+     * 鏄剧ず浠诲姟娴佺▼鎸夐挳
+     */
+    private Boolean showTaskFlow = false;
+    /**
+     * 澶栭儴鑺傜偣璇锋眰缁撴灉
+     */
+    private Boolean outSideStatus = true;
+    /**
+     * 澶栭儴鑺傜偣閿欒鎻愮ず
+     */
+    private String errorTip;
+    /**
+     * 澶栭儴鑺傜偣閿欒鏁版嵁
+     */
+    private String errorData;
+    /**
+     * 澶栭儴鑺傜偣鏄惁閲嶈瘯
+     */
+    private Boolean isRetry = false;
+    /**
+     * 鏄惁鏈夋妱閫�
+     */
+    private Boolean isCirculate = false;
+
+    /**
+     * 瀹℃壒绫诲瀷
+     */
+    private Integer assigneeType;
+
+}

--
Gitblit v1.8.0