From c560649e37ab5a5bc29c47a3fa7309dc912b48cb Mon Sep 17 00:00:00 2001
From: 李天宇 <876263681@qq.com>
Date: 星期五, 25 十月 2024 09:33:08 +0800
Subject: [PATCH] #update 修复wms库存明细统计bug，实现客户导出需求
---
src/main/java/com/zy/asrs/entity/Mat.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 71434c5..428d94c 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -63,18 +63,18 @@
private Long tagId;
/**
- * 鐗╂枡鍙�
- */
- @ApiModelProperty(value= "鐗╂枡鍙�")
- @ExcelProperty(value = "鐗╂枡鍙�")
- private String matnr;
-
-
- /**
* 鍝佸彿
*/
@ApiModelProperty(value= "鍝佸彿")
@ExcelProperty(value = "鍝佸彿")
+ private String matnr;
+
+
+ /**
+ * 鍝佸悕
+ */
+ @ApiModelProperty(value= "鍝佸悕")
+ @ExcelProperty(value = "鍝佸悕")
private String maktx;
/**
@@ -110,14 +110,14 @@
*/
@ApiModelProperty(value= "绫诲瀷")
// @ApiModelProperty(value= "鍝佺墝")
- @ExcelIgnore
+ @ExcelProperty(value = "绫诲瀷")
private String brand;
/**
* 鍗曚綅
*/
@ApiModelProperty(value= "鍗曚綅")
- @ExcelIgnore
+ @ExcelProperty(value = "鍗曚綅")
private String unit;
/**
@@ -367,8 +367,8 @@
// Mat mat = new Mat(
// null, // 缂栧彿
// null, // 鎵�灞炲綊绫�
-// null, // 鐗╂枡鍙�
// null, // 鍝佸彿
+// null, // 鍝佸悕
// null, // 鍒悕
// null, // 瑙勬牸
// null, // 鍨嬪彿
--
Gitblit v1.9.1