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/YieldDTO.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/YieldDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/YieldDTO.java
index 957a78e..2604642 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/YieldDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/YieldDTO.java
@@ -16,11 +16,11 @@
@ExcelProperty("浜у搧鍚嶇О")
private String productName;
@ExcelProperty("瀹屽伐闈㈢Н")
- private String finishedArea;
+ private Double finishedArea;
@ExcelProperty("娆＄牬闈㈢Н")
- private String brokenArea;
+ private Double brokenArea;
@ExcelProperty("鎬婚潰绉�")
- private String area;
+ private Double area;
@ExcelProperty("鎴愬搧鐜�")
private String finished;
}
--
Gitblit v1.8.0