From 77c7984fb636f81a87208aea2bcffc701f6419e8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 23 十月 2024 16:01:26 +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/DeliveryDetailDTO.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 2ed2319..da879fb 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
@@ -29,11 +29,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("瀹㈡埛缂栧彿")
--
Gitblit v1.8.0