From 014cf0c32726b85230809c78a83963af8707ae6b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 24 十月 2024 10:06:38 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/dto/sd/CustomerDTO.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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..34219ff 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;
@ExcelProperty("闈㈢Н")
private Double area;
@ExcelProperty("鍗曚环")
- private Integer price;
+ private Double price;
@ExcelProperty("閲戦")
private Double money;
--
Gitblit v1.8.0