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/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