From d809ecd16cbb23f5aad86a6844f51ffea0455fe8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 06 九月 2024 16:53: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/DeliveryDetailDTO.java |    9 +++++++++
 1 files changed, 9 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 6ca7f79..7173d05 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,14 +18,22 @@
     private String deliveryId;
     @ExcelProperty("鍙戣揣搴忓彿")
     private Integer deliveryNumber;
+    @ExcelProperty("浜у搧Id")
+    private Integer productId;
+    @ExcelProperty("浜у搧")
+    private String productName;
     @ExcelProperty("浠樻鏉′欢")
     private String paymentTerms;
     @ExcelProperty("椤圭洰鍚嶇О")
     private String project;
     @ExcelProperty("鏁伴噺")
     private Integer quantity;
+    @ExcelProperty("鍗曚环")
+    private Double price;
     @ExcelProperty("闈㈢Н")
     private Double area;
+    @ExcelProperty("鍏朵粬閲戦")
+    private Double otherMoney;
     @ExcelProperty("閲戦")
     private Double money;
     @ExcelProperty("瀹㈡埛缂栧彿")
@@ -61,4 +69,5 @@
 
 
 
+
 }

--
Gitblit v1.8.0