From 2c296fe96659899097f650a89a56a415424c34a5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 18 七月 2024 15:55:31 +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/DeliveryDetailDTO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java
index 797b1cb..1091792 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java
@@ -18,6 +18,10 @@
     private String deliveryId;
     @ExcelProperty("鍙戣揣搴忓彿")
     private Integer deliveryNumber;
+    @ExcelProperty("浜у搧Id")
+    private Integer productId;
+    @ExcelProperty("浜у搧")
+    private String productName;
     @ExcelProperty("浠樻鏉′欢")
     private String paymentTerms;
     @ExcelProperty("椤圭洰鍚嶇О")
@@ -32,6 +36,8 @@
     private String customerId;
     @ExcelProperty("瀹㈡埛鍚嶇О")
     private String customerName;
+    @ExcelProperty("瀹㈡埛绠�绉�")
+    private String customerAbbreviation;
     @ExcelProperty("閫佽揣鏃ユ湡")
     private LocalDate deliveryDate;
     @ExcelProperty("鏀粯鏂瑰紡")

--
Gitblit v1.8.0