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/FarmPaper.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farm/entity/FarmPaper.java b/src/main/java/org/springblade/modules/farm/entity/FarmPaper.java
index f928445..a31897a 100644
--- a/src/main/java/org/springblade/modules/farm/entity/FarmPaper.java
+++ b/src/main/java/org/springblade/modules/farm/entity/FarmPaper.java
@@ -63,9 +63,9 @@
 	private String type;
 
 	/**
-	 * 租户id
+	 * 公司id
 	 */
-	private Integer farmId;
+	private String deptId;
 
 	/**
 	 * 创建时间
@@ -74,5 +74,9 @@
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 
+	/**
+	 * 农场id
+	 */
+	private Integer farmId;
 
 }

--
Gitblit v1.9.3