From 6aeb134430e16e0dde739da0274c1d60273f0f89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 10 十月 2025 09:08:37 +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 | 12 ++++++++++++
1 files changed, 12 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 7173d05..1265cd6 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
@@ -34,6 +34,12 @@
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,6 +68,12 @@
private String orderId;
@ExcelProperty("璁㈠崟搴忓彿")
private Integer orderNumber;
+ @ExcelProperty("鎵规")
+ private String batch;
+ @ExcelProperty("瀹�")
+ private Double width;
+ @ExcelProperty("楂�")
+ private Double height;
@ExcelProperty("澶囨敞")
private String deliveryDetailRemakes;
@ExcelProperty("鎶ヨ〃鏃ユ湡")
--
Gitblit v1.8.0