From 014cf0c32726b85230809c78a83963af8707ae6b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 24 十月 2024 10:06:38 +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/OrderDTO.java | 6 +++++-
1 files changed, 5 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..8a61ccf 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
@@ -38,11 +38,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