From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +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/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