From 342e2b3a98a33c0f64893986fc9ceae8cdd10b23 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 29 十一月 2022 22:01:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs

---
 src/main/java/com/zy/common/entity/Parameter.java |    3 +++
 1 files changed, 3 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..d42c3d9 100644
--- a/src/main/java/com/zy/common/entity/Parameter.java
+++ b/src/main/java/com/zy/common/entity/Parameter.java
@@ -60,4 +60,7 @@
     // 鎵撳寘涓嬬嚎
     private String packDown;
 
+    // erp涓婃姤
+    private String erpReport;
+
 }

--
Gitblit v1.9.1