From d48d6e9bb0bb48f8338798d8a2cba60396e16698 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 09 Jul 2022 09:52:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/recovery/entity/Recovery.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/recovery/entity/Recovery.java b/src/main/java/org/springblade/modules/recovery/entity/Recovery.java
index b49656d..6334dda 100644
--- a/src/main/java/org/springblade/modules/recovery/entity/Recovery.java
+++ b/src/main/java/org/springblade/modules/recovery/entity/Recovery.java
@@ -61,8 +61,8 @@
 	/**
 	 * 采收时间
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date time;
 
 	/**

--
Gitblit v1.9.3