From ec09030f0730809145c97bfaa0bd0387a7d990bf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 19 Jul 2022 17:45:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java |   14 ++++++++++++++
 1 files changed, 14 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 31f54ac..c41a561 100644
--- a/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
+++ b/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
@@ -32,4 +32,18 @@
 	 * 操作人信息
 	 */
 	private String realName;
+	/**
+	 * 品种名称
+	 */
+	private String strainName;
+
+	/**
+	 * 农场id
+	 */
+	private String farmId;
+
+	/**
+	 * 肥料名称
+	 */
+	private String agriculturalName;
 }

--
Gitblit v1.9.3