From d21b141e59c9994a51349982a255b3b4b42f3e9b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 02 八月 2024 12:04:55 +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 |    6 +++---
 1 files changed, 3 insertions(+), 3 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..8ca3ccd 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,11 +15,11 @@
     @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("闈㈢Н")

--
Gitblit v1.8.0