From 190589f5b186e338f707804527985db623c1084f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 28 七月 2025 17:08:45 +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 6992587..7c4df34 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
@@ -37,8 +37,12 @@
     private Double stockArea;
     @ExcelProperty("鎴愬搧鍚嶇О")
     private String productName;
+    @ExcelProperty("鍦ㄥ埗鍝佸悕绉�")
+    private String glassName;
     @ExcelProperty("寮挗鍗婂緞")
     private String bendRadius;
     @ExcelProperty("缂栧彿")
     private String glassNumber;
+    @ExcelProperty("涓婂伐搴忔姤宸ョ彮缁�")
+    private String teamsGroupsName;
 }

--
Gitblit v1.8.0