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/pp/WorkInProgressDTO.java |    4 ++++
 1 files changed, 4 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..6992587 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,6 @@
     private String productName;
     @ExcelProperty("寮挗鍗婂緞")
     private String bendRadius;
+    @ExcelProperty("缂栧彿")
+    private String glassNumber;
 }

--
Gitblit v1.8.0