From b9e4e2edbb3767ee347a91d2238544ae736b53c0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 22 七月 2025 10:29:27 +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/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 3da05ed..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,6 +37,8 @@
     private Double stockArea;
     @ExcelProperty("鎴愬搧鍚嶇О")
     private String productName;
+    @ExcelProperty("鍦ㄥ埗鍝佸悕绉�")
+    private String glassName;
     @ExcelProperty("寮挗鍗婂緞")
     private String bendRadius;
     @ExcelProperty("缂栧彿")

--
Gitblit v1.8.0