From a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 23 十二月 2023 19:56:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

---
 src/main/java/com/zy/common/entity/Parameter.java |    6 ++++++
 1 files changed, 6 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 0eb52b5..32a1ae1 100644
--- a/src/main/java/com/zy/common/entity/Parameter.java
+++ b/src/main/java/com/zy/common/entity/Parameter.java
@@ -60,4 +60,10 @@
     // 鎵撳寘涓嬬嚎
     private String packDown;
 
+    // erp涓婃姤
+    private String erpReport;
+
+    //鏈烘鑷傝嚜鍔ㄨˉ璐у紑鍏�
+    private String autoReplenishment;
+
 }

--
Gitblit v1.9.1