From 190589f5b186e338f707804527985db623c1084f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 28 七月 2025 17:08:45 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/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 8230fcc..7fe713f 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("瀹屽伐鏁伴噺")
@@ -39,4 +39,16 @@
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;
+ @ExcelProperty("璁㈠崟绫诲瀷")
+ private String orderType;
}
--
Gitblit v1.8.0