From a8378db2feef3b08edc0a6594bec187051d3b754 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 13:32:33 +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/pp/TeamOutputDTO.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
index f3d3f50..4c98910 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
@@ -15,6 +15,8 @@
private String thisProcess;
@ExcelProperty("鎶ュ伐鐝粍")
private String teamsGroupsName;
+ @ExcelProperty("璁㈠崟缂栧彿")
+ private String orderId;
@ExcelProperty("椤圭洰鍚嶇О")
private String project;
@ExcelProperty("娴佺▼鍗″彿")
@@ -51,4 +53,8 @@
private String batch;
@ExcelProperty("璁㈠崟绫诲瀷")
private String orderType;
+ @ExcelProperty("鍦ㄥ埗鍝佸帤搴�")
+ private Double thicknessSum;
+ @ExcelProperty("骞虫柟姣背")
+ private Double thicknessArea;
}
--
Gitblit v1.8.0