From 190589f5b186e338f707804527985db623c1084f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 28 七月 2025 17:08:45 +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/DeliveryDetailProductDTO.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 2b16b4e..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
@@ -28,9 +28,17 @@
@ExcelProperty("鏁伴噺")
private Integer quantity;
@ExcelProperty("鍗曚环")
- private Integer price;
+ 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("瀹㈡埛缂栧彿")
@@ -62,4 +70,5 @@
@ExcelProperty("鎶ヨ〃鏃ユ湡")
private LocalDate createTime;
+
}
--
Gitblit v1.8.0