From 57c109f4c962659e7a8f17ef4cd6b00a551e30ad Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 31 三月 2025 15:07:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lfdasrs-sxkVersion' into lfdasrs-sxkVersion

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

diff --git a/src/main/java/com/zy/common/model/MesCombParam.java b/src/main/java/com/zy/common/model/MesCombParam.java
index 728f04a..888528e 100644
--- a/src/main/java/com/zy/common/model/MesCombParam.java
+++ b/src/main/java/com/zy/common/model/MesCombParam.java
@@ -15,11 +15,18 @@
     private String zpallet;
 
     // 甯墭鏃堕棿
-    private String combTime;
+    private String pakinTime;
 
     // 浠撳簱缂栧彿 - 鍐欐
     private String lgort;
 
+    // 鏂板
+    private String plantCode;
+
+    private String fromCode;
+
+    private String stationCode;
+
     private List<Detl> list = new ArrayList<>();
 
     @Data

--
Gitblit v1.9.1