From 1e159ffbf027d1c8a2de5a92ff257d3b02411415 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 06 Aug 2022 16:50:11 +0800
Subject: [PATCH] 修复使用农资后，已出库待使用农资数据不变。修复使用农资后还能删除出库数据

---
 src/main/java/org/springblade/modules/farm/entity/Farm.java |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farm/entity/Farm.java b/src/main/java/org/springblade/modules/farm/entity/Farm.java
index fc5d7a3..3ddde20 100644
--- a/src/main/java/org/springblade/modules/farm/entity/Farm.java
+++ b/src/main/java/org/springblade/modules/farm/entity/Farm.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;
@@ -65,11 +66,6 @@
 	private String position;
 
 	/**
-	 * 租户id
-	 */
-	private String tenantId;
-
-	/**
 	 * 创建时间
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@@ -84,8 +80,27 @@
 	private Date updateTime;
 
 	/**
-	 * 用户id
+	 * 公司id
 	 */
-	private String userId;
+	private String deptId;
 
+	/**
+	 * 省编号
+	 */
+	private String province;
+
+	/**
+	 * 市编号
+	 */
+	private String city;
+
+	/**
+	 * 区编号
+	 */
+	private String district;
+
+	/**
+	 * 360全景url
+	 */
+	private String panoramic;
 }

--
Gitblit v1.9.3