From 6b6725aac343f6decf4e475ff8b03f5b474e5759 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 18 Oct 2022 10:49:37 +0800
Subject: [PATCH] 拦截farm请求和user请求；用户详情接口增加preAuth注解

---
 src/main/java/org/springblade/modules/recovery/entity/Recovery.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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..062740d 100644
--- a/src/main/java/org/springblade/modules/recovery/entity/Recovery.java
+++ b/src/main/java/org/springblade/modules/recovery/entity/Recovery.java
@@ -35,7 +35,7 @@
 	/**
 	 * 品种id
 	 */
-	private Integer strainId;
+	private String strainId;
 
 	/**
 	 * 土地id
@@ -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;
 
 	/**
@@ -92,4 +92,5 @@
 	 * 租户id
 	 */
 	private String tenantId;
+
 }

--
Gitblit v1.9.3