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/pp/WorkInProgressDTO.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java
index e8b1411..3da05ed 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java
@@ -7,6 +7,8 @@
public class WorkInProgressDTO {
@ExcelProperty("宸ュ簭")
private String thisProcess;
+ @ExcelProperty("閿�鍞崟鍙�")
+ private String orderId;
@ExcelProperty("娴佺▼鍗″彿")
private String processId;
@ExcelProperty("瀹㈡埛鍚嶇О")
@@ -37,4 +39,8 @@
private String productName;
@ExcelProperty("寮挗鍗婂緞")
private String bendRadius;
+ @ExcelProperty("缂栧彿")
+ private String glassNumber;
+ @ExcelProperty("涓婂伐搴忔姤宸ョ彮缁�")
+ private String teamsGroupsName;
}
--
Gitblit v1.8.0