From d231b4211b17951f403d17aa57b2f0d5f9e43f89 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期三, 22 二月 2023 17:22:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs' into bfwcs
---
src/main/java/com/zy/common/model/MatDto.java | 12 +++++++++---
1 files changed, 9 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..619fbdd 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -9,10 +9,14 @@
public class MatDto {
// 鐗╂枡缂栧彿
- private String matNo;
+ private String matnr;
// 鐗╂枡鍚嶇О
private String maknx;
+
+ private String batch;
+
+ private String specs;
// 鐗╂枡鏁伴噺
private Double count;
@@ -20,9 +24,11 @@
public MatDto() {
}
- public MatDto(String matNo, String maknx, Double count) {
- this.matNo = matNo;
+ public MatDto(String matnr, String maknx, String batch, String specs, Double count) {
+ this.matnr = matnr;
this.maknx = maknx;
+ this.batch = batch;
+ this.specs = specs;
this.count = count;
}
}
--
Gitblit v1.9.1