From 6d7633051dc592f80b7967e34fa6e34f340f899d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 18 Jul 2022 15:16:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java b/src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java
index 912bee9..55e3959 100644
--- a/src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java
+++ b/src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java
@@ -23,4 +23,19 @@
 	 */
 	private String strainName;
 
+	/**
+	 * 开始时间
+	 */
+	private String startTime;
+
+	/**
+	 * 结束时间
+	 */
+	private String endTime;
+
+	/**
+	 * 农场id
+	 */
+	private String farmId;
+
 }

--
Gitblit v1.9.3