From ab6ac91b7ed9ae3f9c68766f499ece11585c8859 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 30 六月 2025 08:56:20 +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 | 16 ++++++++++++----
1 files changed, 12 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..33695c0 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,12 @@
private String productName;
@ExcelProperty("缂栧彿")
private String code;
+ @ExcelProperty("瀹℃牳浜�")
+ private String reviewed;
+ @ExcelProperty("瀹℃牳鏃堕棿")
+ private String examineTime;
+ @ExcelProperty("鍦ㄥ埗鍝佸悕绉�")
+ private String workProcessName;
+ @ExcelProperty("鎶ュ伐璁惧")
+ private String deviceName;
}
--
Gitblit v1.8.0