From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog

---
 src/main/java/org/springblade/flow/core/entity/BladeFlow.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/flow/core/entity/BladeFlow.java b/src/main/java/org/springblade/flow/core/entity/BladeFlow.java
index fcc57ec..9cd880f 100644
--- a/src/main/java/org/springblade/flow/core/entity/BladeFlow.java
+++ b/src/main/java/org/springblade/flow/core/entity/BladeFlow.java
@@ -16,6 +16,7 @@
  */
 package org.springblade.flow.core.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.flow.core.constant.ProcessConstant;
@@ -36,8 +37,25 @@
 	// 小区id
 	private String districtId;
 
+	// 小区名称
+	private String districtName;
+
 	// 时间名称
 	private String name;
+
+	/**
+	 * 开始时间
+	 */
+	@ApiModelProperty(value = "开始时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date startTimes;
+
+	/**
+	 * 结束时间
+	 */
+	@ApiModelProperty(value = "结束时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date endTimes;
 
 	/**
 	 * 联系人姓名
@@ -69,6 +87,7 @@
 	/**
 	 * 任务执行人名称
 	 */
+	@ApiModelProperty(value = "任务执行人名称")
 	private String assigneeName;
 	/**
 	 * 流程分类
@@ -81,6 +100,7 @@
 	/**
 	 * 创建时间
 	 */
+	@ApiModelProperty(value = "创建时间")
 	private Date createTime;
 	/**
 	 * 结束时间
@@ -145,10 +165,12 @@
 	/**
 	 * 历史活动流程
 	 */
+	@ApiModelProperty(value = "历史活动流程")
 	private String historyActivityName;
 	/**
 	 * 历史活动耗时
 	 */
+	@ApiModelProperty(value = "历史活动耗时")
 	private String historyActivityDurationTime;
 	/**
 	 * 业务绑定Table
@@ -165,6 +187,7 @@
 	/**
 	 * 任务意见
 	 */
+	@ApiModelProperty(value = "任务意见")
 	private String comment;
 	/**
 	 * 是否通过

--
Gitblit v1.9.3