From c7da09314b249df0e516af98c3faa2f52ef79d50 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 16 七月 2025 17:57:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
index 28289f1..dd0ca32 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
@@ -25,10 +25,10 @@
private String width;
@ExcelProperty("楂�")
private String height;
- @ExcelProperty("褰㈢姸")
- private String shape;
- @ExcelProperty("鍘氬害")
- private String thickness;
+// @ExcelProperty("褰㈢姸")
+// private String shape;
+// @ExcelProperty("鍘氬害")
+// private String thickness;
@ExcelProperty("纾ㄨ竟绫诲瀷")
private String edgingType;
@ExcelProperty("瀹屽伐鏁伴噺")
@@ -37,4 +37,16 @@
private String area;
@ExcelProperty("浜у搧鍚嶇О")
private String productName;
+ @ExcelProperty("缂栧彿")
+ private String code;
+ @ExcelProperty("瀹℃牳浜�")
+ private String reviewed;
+ @ExcelProperty("瀹℃牳鏃堕棿")
+ private String examineTime;
+ @ExcelProperty("鍦ㄥ埗鍝佸悕绉�")
+ private String workProcessName;
+ @ExcelProperty("鎶ュ伐璁惧")
+ private String deviceName;
+ @ExcelProperty("鎵规")
+ private String batch;
}
--
Gitblit v1.8.0