From fada4b3ee4fbae5f82dba72fe8ad175a724d9cf7 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 19 Feb 2024 15:18:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/taskPlaceRectification/vo/TaskPlaceRectificationVO.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/vo/TaskPlaceRectificationVO.java b/src/main/java/org/springblade/modules/taskPlaceRectification/vo/TaskPlaceRectificationVO.java
index 3567730..912835c 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/vo/TaskPlaceRectificationVO.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/vo/TaskPlaceRectificationVO.java
@@ -98,12 +98,12 @@
 
 	@ApiModelProperty(value = "开始时间", example = "")
 	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-	private Date startTime;
+	private String startTime;
 
 	/** 创建时间 */
 	@ApiModelProperty(value = "结束时间", example = "")
 	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-	private Date endTime;
+	private String endTime;
 
 
 

--
Gitblit v1.9.3