From 82a5de6d2ec80b45660149c84be28734032562f6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 11 十月 2024 15:21:53 +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/DeliveryDetailProductDTO.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailProductDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailProductDTO.java
index 69f537a..42e18c2 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailProductDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailProductDTO.java
@@ -27,8 +27,18 @@
     private String project;
     @ExcelProperty("鏁伴噺")
     private Integer quantity;
+    @ExcelProperty("鍗曚环")
+    private Double price;
     @ExcelProperty("闈㈢Н")
     private Double area;
+    @ExcelProperty("鍏朵粬閲戦")
+    private Double otherMoney;
+    @ExcelProperty("杩愯垂閲戦")
+    private Double freight;
+    @ExcelProperty("杩愯垂鍗曚环")
+    private Double freightPrice;
+    @ExcelProperty("杩愯垂鏁伴噺")
+    private Double freightQuantity;
     @ExcelProperty("閲戦")
     private Double money;
     @ExcelProperty("瀹㈡埛缂栧彿")
@@ -60,4 +70,5 @@
     @ExcelProperty("鎶ヨ〃鏃ユ湡")
     private LocalDate createTime;
 
+
 }

--
Gitblit v1.8.0