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/TaskCompletionStatusDTO.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TaskCompletionStatusDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TaskCompletionStatusDTO.java
index acfb121..7020571 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TaskCompletionStatusDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TaskCompletionStatusDTO.java
@@ -14,11 +14,11 @@
@ExcelProperty("閿�鍞崟鍙�")
private String orderId;
@ExcelProperty("璁㈠崟鏁伴噺")
- private String quantity;
+ private Integer quantity;
@ExcelProperty("璁㈠崟闈㈢Н")
- private String area;
+ private Double area;
@ExcelProperty("鍙戣揣鏁伴噺")
- private String shippedQuantity;
+ private Integer shippedQuantity;
@ExcelProperty("鍙戣揣闈㈢Н")
- private String shippedArea;
+ private Double shippedArea;
}
--
Gitblit v1.8.0