From 42a7552b9c8603aeab7f0785eb05270dfbeb0bd3 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 02 三月 2025 10:16:20 +0800
Subject: [PATCH] Merge branch 'master' into dev

---
 flowable/src/main/java/com/ycl/domain/vo/FormDetailVO.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/flowable/src/main/java/com/ycl/domain/vo/FormDetailVO.java b/flowable/src/main/java/com/ycl/domain/vo/FormDetailVO.java
index eaa4c20..f83c194 100644
--- a/flowable/src/main/java/com/ycl/domain/vo/FormDetailVO.java
+++ b/flowable/src/main/java/com/ycl/domain/vo/FormDetailVO.java
@@ -1,7 +1,9 @@
 package com.ycl.domain.vo;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.ycl.common.enums.business.TaskStatusEnum;
 import lombok.Data;
+import org.flowable.bpmn.model.UserTask;
 
 import java.util.Map;
 
@@ -34,6 +36,17 @@
     private boolean canWait;
 
     /**
+     * 鏄惁鍏佽鎸傝捣
+     *
+     */
+    private boolean canHangup;
+
+    /**
+     * 浠诲姟鐨勭姸鎬侊細鎸傝捣銆佸缂�
+     */
+    private TaskStatusEnum taskStatus;
+
+    /**
      * 鍓嶇疆鑺傜偣瀹氫箟id
      *
      */
@@ -51,5 +64,9 @@
      */
     private Map<String, Object> formJsonObj;
 
-
+    /**
+     * 浠诲姟鍏冩暟鎹�
+     *
+     */
+    private UserTask userTask;
 }

--
Gitblit v1.8.0