From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/dto/pp/SplittingDetailsOutsideDTO.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/SplittingDetailsOutsideDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/SplittingDetailsOutsideDTO.java
index 540e68d..599d6a9 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/SplittingDetailsOutsideDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/SplittingDetailsOutsideDTO.java
@@ -10,15 +10,15 @@
@ExcelProperty("璁㈠崟搴忓彿")
private String orderNumber;
@ExcelProperty("灏忕墖椤哄簭")
- private String technologyNumber;
+ private Integer technologyNumber;
@ExcelProperty("椤圭洰鍚嶇О")
private String project;
@ExcelProperty("鎵规")
private String batch;
@ExcelProperty("瀹�")
- private String childWidth;
+ private Double childWidth;
@ExcelProperty("楂�")
- private String childHeight;
+ private Double childHeight;
@ExcelProperty("璁㈠崟鏁�")
private Integer quantity;
@ExcelProperty("闈㈢Н")
--
Gitblit v1.8.0