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 | 25 ++++++++++++++++++++++++-
1 files changed, 24 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 99c3049..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
@@ -1,5 +1,6 @@
package com.example.erp.dto.sd;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.example.erp.entity.sd.Order;
import lombok.Data;
@@ -8,22 +9,44 @@
@EqualsAndHashCode(callSuper = true)
@Data
public class OrderDTO extends Order {
+ @ExcelProperty("浜у搧Id")
private Integer productId;
+ @ExcelProperty("浜у搧鍚嶇О")
private String productName;
+ @ExcelProperty("璁㈠崟搴忓彿")
private Integer orderNumber;
+ @ExcelProperty("瀹�")
private Double width;
+ @ExcelProperty("楂�")
private Double height;
+ @ExcelProperty("鏁伴噺")
private Long quantity;
+ @ExcelProperty("寮挗寮у害")
private Integer bendRadius;
+ @ExcelProperty("瀹為檯鎬婚潰绉�")
private Double grossArea;
+ @ExcelProperty("缁撶畻鎬婚潰绉�")
private Double computeGrossArea;
+ @ExcelProperty("褰㈢姸")
private String shape;
+ @ExcelProperty("纾ㄨ竟绫诲瀷")
private String edgingType;
+ @ExcelProperty("澶囨敞")
private String remarks;
+ @ExcelProperty("鍛ㄩ暱")
private Double perimeter;
+ @ExcelProperty("鍗曚环")
private Double price;
- private Long grossAmount;
+ @ExcelProperty("鎬婚噾棰�")
+ 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