From fff999d37a7f9791dabeb9bb802dfe454a86397e Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 16 八月 2025 15:05:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index c414407..8fa2429 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -19,6 +19,9 @@
// 搴撲綅缂栧彿
private String locNo;
+ //閫�搴撶粍鎵�
+ private String tkFlag;
+
private List<CombMat> combMats;
@@ -62,6 +65,9 @@
//
private String tiaoma;
+ //搴撳瓨鐘舵��
+ private String cstateid;
+
}
}
--
Gitblit v1.9.1