From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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/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