From d18eb5bd8b9cf93ba7adb4ee97fdcaccd3838e79 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 24 Aug 2022 10:36:10 +0800
Subject: [PATCH] 删除回滚完善，销售损耗添加字段type、prodId、地块选择数据返回增加库存量和面积

---
 src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 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 6dfb787..1a85084 100644
--- a/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java
+++ b/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java
@@ -6,7 +6,6 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -25,7 +24,7 @@
 	 * 主键id
 	 */
 	@TableId(value = "id",type = IdType.AUTO)
-	private Integer id;
+	private Long id;
 
 	/**
 	 * 土地id
@@ -119,4 +118,25 @@
 	 */
 	private String createUser;
 
+	/**
+	 * 种植状态 1：种植中 2：已采收
+	 */
+	private String status;
+
+
+	/**
+	 * 部门id
+	 */
+	private String deptId;
+
+	/**
+	 * 租户id
+	 */
+	private String tenantId;
+	/**
+	 * 结束种养时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date endPlantTime;
 }

--
Gitblit v1.9.3