From bbfb525c87ab208f123f8f5a4c7c6a87df4a3a23 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 26 九月 2023 15:08:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
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