From b7b04173afd9a05cedda9f44c53e52847806fb51 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Thu, 04 Aug 2022 15:56:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java |    9 +++++++++
 1 files changed, 9 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 c87c04c..7aac72a 100644
--- a/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
+++ b/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
@@ -41,4 +41,13 @@
 	 * 农场id
 	 */
 	private String farmId;
+
+	/**
+	 * 肥料名称
+	 */
+	private String agriculturalName;
+	/**
+	 * 农资公司名称
+	 */
+	private String factoryName;
 }

--
Gitblit v1.9.3