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/DamageReportDTO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java
index 9de34c0..bc78e65 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java
@@ -13,6 +13,8 @@
     private String orderId;
     @ExcelProperty("椤圭洰鍚嶇О")
     private String project;
+    @ExcelProperty("鎵规")
+    private String batch;
     @ExcelProperty("娴佺▼鍗″彿")
     private String processId;
     @ExcelProperty("璁㈠崟搴忓彿")
@@ -42,5 +44,9 @@
     private String glassChild;
     @ExcelProperty("缂栧彿")
     private String glassNumber;
+    @ExcelProperty("瀹�")
+    private String childWidth;
+    @ExcelProperty("楂�")
+    private String childHeight;
 
 }

--
Gitblit v1.8.0