From e51e45f2cabcc4628ce93e55c7c3806b1b760161 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 11 八月 2025 16:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java
index 7c4df34..1e3b104 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java
@@ -28,9 +28,9 @@
     @ExcelProperty("璁㈠崟鏁�")
     private Integer quantity;
     @ExcelProperty("瀹�")
-    private String childWidth;
+    private Double childWidth;
     @ExcelProperty("楂�")
-    private String childHeight;
+    private Double childHeight;
     @ExcelProperty("搴撳瓨鏁�")
     private Integer stockNum;
     @ExcelProperty("搴撳瓨闈㈢Н")

--
Gitblit v1.8.0