From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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/OrderDTO.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 7b82ca0..d593aca 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
@@ -27,6 +27,8 @@
private Double grossArea;
@ExcelProperty("缁撶畻鎬婚潰绉�")
private Double computeGrossArea;
+ @ExcelProperty("閲嶉噺")
+ private Double weights;
@ExcelProperty("褰㈢姸")
private String shape;
@ExcelProperty("纾ㄨ竟绫诲瀷")
@@ -38,11 +40,15 @@
@ExcelProperty("鍗曚环")
private Double price;
@ExcelProperty("鎬婚噾棰�")
- private Long grossAmount;
+ private Double grossAmount;
@ExcelProperty("涓�绾х被鍒�")
private String levelOne;
@ExcelProperty("浜岀骇绫诲埆")
private String levelTwo;
@ExcelProperty("鎬诲帤搴�")
private String totalThickness;
+ @ExcelProperty("瀹㈡埛绠�绉�")
+ private String customerAbbreviation;
+ @ExcelProperty("璁㈠崟鍔犲伐瑕佹眰")
+ private String processingNotes;
}
--
Gitblit v1.8.0