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/FlowViewerDto.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/flowable/src/main/java/com/ycl/domain/dto/FlowViewerDto.java b/flowable/src/main/java/com/ycl/domain/dto/FlowViewerDto.java index 63f252f..9bad65e 100644 --- a/flowable/src/main/java/com/ycl/domain/dto/FlowViewerDto.java +++ b/flowable/src/main/java/com/ycl/domain/dto/FlowViewerDto.java @@ -22,7 +22,17 @@ private boolean completed; /** - * 鏄惁宸茬粡瓒呮椂 + * 椤圭洰瓒呮椂棰滆壊鐮� green/yellow/red */ - private boolean overtime; + private String overtime; + + /** + * 鏄惁瀹圭己浜� + */ + private Boolean hasWait; + + /** + * 鏄惁璺宠繃浜� + */ + private Boolean hasJump; } -- Gitblit v1.8.0