From e37630cbd344bd3e9b95964df31e7c23338c0924 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 01 Jul 2022 10:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/farm/entity/FarmPaper.java |    4 ++--
 1 files changed, 2 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..4166f2e 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;
 
 	/**
 	 * 创建时间

--
Gitblit v1.9.3