From d809ecd16cbb23f5aad86a6844f51ffea0455fe8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 06 九月 2024 16:53:55 +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 |    2 ++
 1 files changed, 2 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..554684c 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("瀹㈡埛鍚嶇О")

--
Gitblit v1.8.0