From 4d48da87faccd9c11fe644e92edd54ca0e167b69 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 09 Jul 2022 09:47:40 +0800
Subject: [PATCH] 农场，地块列表查询新增，不分页

---
 src/main/java/org/springblade/modules/recovery/entity/Recovery.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 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 02a70bf..6334dda 100644
--- a/src/main/java/org/springblade/modules/recovery/entity/Recovery.java
+++ b/src/main/java/org/springblade/modules/recovery/entity/Recovery.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springblade.core.tenant.mp.TenantEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.io.Serializable;
 import java.util.Date;
@@ -24,7 +25,7 @@
 	 * 主键id
 	 */
 	@TableId(value = "id",type = IdType.AUTO)
-	private Integer id;
+	private Long id;
 
 	/**
 	 * 种植记录id
@@ -60,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;
 
 	/**
@@ -82,8 +83,13 @@
 	private Date createTime;
 
 	/**
-	 * 溯源码编号
+	 * 农场id
 	 */
-	private String code;
+	private String deptId;
 
+
+	/**
+	 * 租户id
+	 */
+	private String tenantId;
 }

--
Gitblit v1.9.3