From 4f4ae801fbd52546ee65353b43af7b41f37d9a44 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 20 十一月 2024 16:27:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
src/main/java/com/zy/asrs/entity/Mat.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 909108a..48feb8e 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -305,6 +305,13 @@
@ExcelProperty(value = "澶囨敞")
private String memo;
+ /**
+ * 鏃у晢鍝佺紪鍙�
+ */
+ @ApiModelProperty(value= "鏃у晢鍝佺紪鍙�")
+ @ExcelProperty(value = "鏃у晢鍝佺紪鐮�")
+ private String matnr2;
+
public Mat() {}
public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
--
Gitblit v1.9.1