From be9da335cb28e12e1439c24e4596f069e342d83f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 15:16:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/processInv/entity/ProcessInv.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/processInv/entity/ProcessInv.java b/src/main/java/org/springblade/modules/processInv/entity/ProcessInv.java
index a114d48..2aab29e 100644
--- a/src/main/java/org/springblade/modules/processInv/entity/ProcessInv.java
+++ b/src/main/java/org/springblade/modules/processInv/entity/ProcessInv.java
@@ -48,6 +48,9 @@
 	* 产品库存数量
 	*/
 	private Double productInventoryNum;
-
+	/**
+	 * 农场id
+	 */
+	private String farmId;
 
 }

--
Gitblit v1.9.3