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/sd/CustomerDTO.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/sd/CustomerDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/sd/CustomerDTO.java
index 59d65b5..a7f6319 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/sd/CustomerDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/sd/CustomerDTO.java
@@ -15,17 +15,17 @@
     @ExcelProperty("鍙戣揣鍗曞彿")
     private String deliveryId;
     @ExcelProperty("閿�鍞崟鍙�")
-    private String productName;
-    @ExcelProperty("椤圭洰鍚嶇О")
     private String orderId;
-    @ExcelProperty("浜у搧")
+    @ExcelProperty("椤圭洰鍚嶇О")
     private String project;
+    @ExcelProperty("浜у搧")
+    private String productName;
     @ExcelProperty("鏁伴噺")
-    private Integer quantity;
+    private Double quantity;
     @ExcelProperty("闈㈢Н")
     private Double area;
     @ExcelProperty("鍗曚环")
-    private Integer price;
+    private Double price;
     @ExcelProperty("閲戦")
     private Double money;
 

--
Gitblit v1.8.0