From cec870f99fa6e3f2535c33ca1f93e0d0de686702 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 31 三月 2025 10:48:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/dto/FlowMyBusinessDto.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/dto/FlowMyBusinessDto.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/dto/FlowMyBusinessDto.java
index a4cd3b5..5c99fc1 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/dto/FlowMyBusinessDto.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/dto/FlowMyBusinessDto.java
@@ -128,11 +128,24 @@
private transient String flowName;
/**娴佺▼寮�濮嬫椂闂�*/
- private transient String startTime;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private transient Date startTime;
/**娴佺▼缁撴潫鏃堕棿*/
- private transient String endTime;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private transient Date endTime;
/**褰撳墠鐢ㄦ埛*/
private transient String currentUser;
+
+ @ApiModelProperty(value = "鍓嶉┍鑺傜偣")
+ private transient String preNode;
+
+ /**澶勭悊鏃堕暱锛堝垎閽燂級*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "澶勭悊鏃堕暱锛堝垎閽燂級")
+ private transient String duration;
+
}
--
Gitblit v1.9.3