From b196900d48deefb0129e28df0a842fadc3d6bff1 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:54:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |    7 +++++++
 1 files changed, 7 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 d1d5cfd..472fe59 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -12,6 +12,9 @@
 public class CombParam {
 
     // 鍗曟嵁缂栧彿
+    private String billNo;
+
+    // 鍗曟嵁缂栧彿
     private String orderNo;
 
     // 鎵樼洏鏉$爜
@@ -28,6 +31,10 @@
         // 鐗╂枡缂栧彿
         private String matnr;
 
+
+        // 搴忓垪鐮�
+        private String itemBatch;
+
         // 搴忓垪鐮�
         private String batch;
 

--
Gitblit v1.9.1