From bcb5e464f879458c421069e7d8c72d8c16b4ac7b Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期六, 13 八月 2022 10:32:46 +0800
Subject: [PATCH] Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs
---
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