From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 c6121cb..f3d3f50 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
@@ -20,11 +20,11 @@
@ExcelProperty("娴佺▼鍗″彿")
private String processId;
@ExcelProperty("搴忓彿")
- private String orderNumber;
+ private Integer orderNumber;
@ExcelProperty("瀹�")
- private String width;
+ private Integer width;
@ExcelProperty("楂�")
- private String height;
+ private Integer height;
// @ExcelProperty("褰㈢姸")
// private String shape;
// @ExcelProperty("鍘氬害")
@@ -32,11 +32,23 @@
@ExcelProperty("纾ㄨ竟绫诲瀷")
private String edgingType;
@ExcelProperty("瀹屽伐鏁伴噺")
- private String completedQuantity;
+ private Integer completedQuantity;
@ExcelProperty("瀹屽伐闈㈢Н")
- private String area;
+ private Double 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;
+ @ExcelProperty("璁㈠崟绫诲瀷")
+ private String orderType;
}
--
Gitblit v1.8.0