From 43322d13c1876b1705f8ba1eb2ef32e7a433cacc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 十二月 2025 16:57:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java
index 148f2cd..67b2206 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java
@@ -15,6 +15,8 @@
private String productName;
@ExcelProperty("璁㈠崟搴忓彿")
private Integer orderNumber;
+ @ExcelProperty("妤煎眰缂栧彿")
+ private String buildingNumber;
@ExcelProperty("瀹�")
private Double width;
@ExcelProperty("楂�")
@@ -27,6 +29,8 @@
private Double grossArea;
@ExcelProperty("缁撶畻鎬婚潰绉�")
private Double computeGrossArea;
+ @ExcelProperty("閲嶉噺")
+ private Double weights;
@ExcelProperty("褰㈢姸")
private String shape;
@ExcelProperty("纾ㄨ竟绫诲瀷")
@@ -47,4 +51,6 @@
private String totalThickness;
@ExcelProperty("瀹㈡埛绠�绉�")
private String customerAbbreviation;
+ @ExcelProperty("璁㈠崟鍔犲伐瑕佹眰")
+ private String processingNotes;
}
--
Gitblit v1.8.0