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 |   14 ++++++++++++++
 1 files changed, 14 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 e19b459..472fe59 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.entity.param;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -9,6 +10,9 @@
  */
 @Data
 public class CombParam {
+
+    // 鍗曟嵁缂栧彿
+    private String billNo;
 
     // 鍗曟嵁缂栧彿
     private String orderNo;
@@ -27,12 +31,22 @@
         // 鐗╂枡缂栧彿
         private String matnr;
 
+
+        // 搴忓垪鐮�
+        private String itemBatch;
+
         // 搴忓垪鐮�
         private String batch;
 
         // 鐗╂枡鏁伴噺
         private Double anfme;
 
+        // 鍟嗗搧鍚嶇О
+        private String maktx;
+
+        // 瑙勬牸
+        private String specs;
+
     }
 
 }

--
Gitblit v1.9.1