From c4ab6a24d2825f11a0de0f165667dc533c458a01 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 三月 2025 10:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 flowable/src/main/java/com/ycl/domain/dto/FlowTaskDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/flowable/src/main/java/com/ycl/domain/dto/FlowTaskDto.java b/flowable/src/main/java/com/ycl/domain/dto/FlowTaskDto.java
index 1e639a4..d4af86e 100644
--- a/flowable/src/main/java/com/ycl/domain/dto/FlowTaskDto.java
+++ b/flowable/src/main/java/com/ycl/domain/dto/FlowTaskDto.java
@@ -99,6 +99,6 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date finishTime;
 
-    private Boolean overtime;
+    private String overtime;
 
 }

--
Gitblit v1.8.0