From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +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/WorkInProgressCombinationDTO.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressCombinationDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressCombinationDTO.java
new file mode 100644
index 0000000..e45f8e6
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressCombinationDTO.java
@@ -0,0 +1,19 @@
+package com.example.erp.dto.pp;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+public class WorkInProgressCombinationDTO {
+    @ExcelProperty("宸ュ簭")
+    private String thisProcess;
+    @ExcelProperty("椤圭洰鍚嶇О")
+    private String project;
+
+    @ExcelProperty("搴撳瓨鏁�")
+    private Integer stockNum;
+    @ExcelProperty("搴撳瓨闈㈢Н")
+    private Double stockArea;
+    @ExcelProperty("鍦ㄥ埗鍝佸悕绉�")
+    private String glassName;
+}

--
Gitblit v1.8.0