From 2648880bec1583ce4fe1886de65300f0a22638d0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 26 Sep 2022 17:09:31 +0800
Subject: [PATCH] 更改种类描述的判断方式、溯源时地图详情sql调整、农资出库时删除数据回滚修复、大屏接受数据增加展示判断

---
 src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java b/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java
index fe50901..a526911 100644
--- a/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java
+++ b/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java
@@ -133,5 +133,14 @@
 	 * 租户id
 	 */
 	private String tenantId;
-
+	/**
+	 * 结束种养时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date endPlantTime;
+	/**
+	 * 移栽时，移栽来源的地块id
+	 */
+	private String otherLandId;
 }

--
Gitblit v1.9.3