From 43322d13c1876b1705f8ba1eb2ef32e7a433cacc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 十二月 2025 16:57:06 +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/ProcessToBeCompletedDTO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/ProcessToBeCompletedDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/ProcessToBeCompletedDTO.java
index 4602cfe..720774b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/ProcessToBeCompletedDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/ProcessToBeCompletedDTO.java
@@ -28,9 +28,9 @@
@ExcelProperty("鍗曠墖鍚嶇О")
private String glassChild;
@ExcelProperty("瀹�")
- private String childWidth;
+ private Double childWidth;
@ExcelProperty("楂�")
- private String childHeight;
+ private Double childHeight;
@ExcelProperty("璁㈠崟鏁伴噺")
private Integer quantity;
@ExcelProperty("鍗曠墖闈㈢Н")
@@ -47,4 +47,6 @@
private Double incompleteArea;
@ExcelProperty("鎴愬搧鍚嶇О")
private String productName;
+ @ExcelProperty("鍘氬害")
+ private String thickness;
}
--
Gitblit v1.8.0