From f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:16:02 +0800
Subject: [PATCH] 合并代码,解决冲突

---
 src/main/java/com/zy/common/model/MesCombParam.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/common/model/MesCombParam.java b/src/main/java/com/zy/common/model/MesCombParam.java
index 068f83d..888528e 100644
--- a/src/main/java/com/zy/common/model/MesCombParam.java
+++ b/src/main/java/com/zy/common/model/MesCombParam.java
@@ -20,6 +20,13 @@
     // 浠撳簱缂栧彿 - 鍐欐
     private String lgort;
 
+    // 鏂板
+    private String plantCode;
+
+    private String fromCode;
+
+    private String stationCode;
+
     private List<Detl> list = new ArrayList<>();
 
     @Data

--
Gitblit v1.9.1