From 1a56f6f4a0c2b8fc61bfde8bd3418a9731b87647 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 25 十月 2024 12:38:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhtwcs' into tzhtwcs

---
 src/main/java/com/zy/common/model/MatDto.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index e5b625b..a4b9cf1 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -9,7 +9,7 @@
 public class MatDto {
 
     // 鐗╂枡缂栧彿
-    private String matNo;
+    private String matnr;
 
     // 鐗╂枡鍚嶇О
     private String maknx;
@@ -17,12 +17,20 @@
     // 鐗╂枡鏁伴噺
     private Double count;
 
+    // 鐗╂枡鏁伴噺
+    private String specs;
+
+    // 鍥惧彿
+    private String model;
+
     public MatDto() {
     }
 
-    public MatDto(String matNo, String maknx, Double count) {
-        this.matNo = matNo;
+    public MatDto(String matnr, String maknx, Double count, String specs,String model) {
+        this.matnr = matnr;
         this.maknx = maknx;
         this.count = count;
+        this.specs = specs;
+        this.model = model;
     }
 }

--
Gitblit v1.9.1