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/sale/vo/SaleVO.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/sale/vo/SaleVO.java b/src/main/java/org/springblade/modules/sale/vo/SaleVO.java
index 05ae913..8e0687f 100644
--- a/src/main/java/org/springblade/modules/sale/vo/SaleVO.java
+++ b/src/main/java/org/springblade/modules/sale/vo/SaleVO.java
@@ -59,4 +59,13 @@
 	 * 种养时间
 	 */
 	private String transplanTime;
+
+	/**
+	 * 农场id
+	 */
+	private String farmId;
+	/**
+	 * 库存量主键id
+	 */
+	private String proid;
 }

--
Gitblit v1.9.3