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/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