From a57a39de178fcc2bda213e7791d61d2570c4831e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 15 Jul 2022 14:27:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java b/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
index b31c660..c41a561 100644
--- a/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
+++ b/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
@@ -36,4 +36,14 @@
 	 * 品种名称
 	 */
 	private String strainName;
+
+	/**
+	 * 农场id
+	 */
+	private String farmId;
+
+	/**
+	 * 肥料名称
+	 */
+	private String agriculturalName;
 }

--
Gitblit v1.9.3