From c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 14:31:31 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/common/entity/Parameter.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/entity/Parameter.java b/src/main/java/com/zy/common/entity/Parameter.java
index 32a1ae1..fe66c2a 100644
--- a/src/main/java/com/zy/common/entity/Parameter.java
+++ b/src/main/java/com/zy/common/entity/Parameter.java
@@ -66,4 +66,15 @@
//鏈烘鑷傝嚜鍔ㄨˉ璐у紑鍏�
private String autoReplenishment;
+ //绌烘澘鑷姩鍑哄簱-鍖呰
+ private String packageEmptyAutoOUt;
+
+ //绌烘澘鑷姩鍑哄簱-鍘熸潗鏂�
+ private String mateEmptyAutoOut;
+
+ //绌烘澘鑷姩鍑哄簱-绠卞３
+ private String boxEmptyAutoOut;
+
+
+
}
--
Gitblit v1.9.1