From 1e9a52cf65f364b4332a008210700adbaea0c35e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 06 九月 2024 11:34:16 +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 | 4 +++-
1 files changed, 3 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 55d61e1..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,7 +38,7 @@
@ExcelProperty("鍗曚环")
private Double price;
@ExcelProperty("鎬婚噾棰�")
- private Long grossAmount;
+ private Double grossAmount;
@ExcelProperty("涓�绾х被鍒�")
private String levelOne;
@ExcelProperty("浜岀骇绫诲埆")
@@ -47,4 +47,6 @@
private String totalThickness;
@ExcelProperty("瀹㈡埛绠�绉�")
private String customerAbbreviation;
+ @ExcelProperty("璁㈠崟鍔犲伐瑕佹眰")
+ private String processingNotes;
}
--
Gitblit v1.8.0