From 2028b51aeda2b6b23fda4183875b145d5e83822f Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 19 六月 2024 11:06:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs

---
 src/main/java/com/zy/common/model/MatDto.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index 14a2afd..99a2f28 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -14,17 +14,33 @@
     // 鐗╂枡鍚嶇О
     private String maknx;
 
-    // 搴撲綅瑙勬牸
+    private String batch;
+
     private String specs;
+
+    // 瀹㈡埛淇℃伅
+    private String manu;
+
+    // 澶囨敞
+    private String memo;
 
     // 鐗╂枡鏁伴噺
     private Double count;
 
-    // 搴撲綅鏁伴噺
     private Double total;
 
     public MatDto() {
     }
+    public MatDto(String matnr, String maknx, String batch, String specs, String manu, String memo, Double count, Double total) {
+        this.matnr = matnr;
+        this.maknx = maknx;
+        this.batch = batch;
+        this.specs = specs;
+        this.manu = manu;
+        this.memo = memo;
+        this.count = count;
+        this.total = total;
+    }
 
     public MatDto(String matNo, String maknx, Double count) {
         this.matnr = matNo;

--
Gitblit v1.9.1