From 62cd133e894d8cc8d527d5e94a4310794e03f763 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 14 Nov 2023 14:12:20 +0800
Subject: [PATCH] 试用期校验去除

---
 src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java b/src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java
index d8b8833..fe9408a 100644
--- a/src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java
+++ b/src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java
@@ -63,6 +63,30 @@
 	private String time;
 
 	/**
+	 * 任务时间
+	 */
+	@ApiModelProperty(value = "预估结束时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private String endtime;
+
+	/**
+	 * 实际开始时间
+	 */
+	@ApiModelProperty(value = "实际开始时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private String stime;
+
+	/**
+	 * 实际结束时间
+	 */
+	@ApiModelProperty(value = "实际结束时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private String sendtime;
+
+	/**
 	 * 省
 	 */
 	@ApiModelProperty(value = "省")
@@ -99,9 +123,9 @@
 	private String raddress;
 
 	/**
-	 * 任务类型
+	 * 任务状态( 0:正在进行、1:已结束、2:任务未开始)
 	 */
-	@ApiModelProperty(value = "任务类型")
+	@ApiModelProperty(value = "任务状态( 0:正在进行、1:已结束、2:任务未开始)")
 	private String rtype;
 
 	/**

--
Gitblit v1.9.3