From 43322d13c1876b1705f8ba1eb2ef32e7a433cacc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 十二月 2025 16:57:06 +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/DamageReportDTO.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 4074604..fa6182f 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
@@ -48,12 +48,15 @@
     private Double childWidth;
     @ExcelProperty("楂�")
     private Double childHeight;
+    @ExcelProperty("鍘氬害")
+    private String thickness;
+    @ExcelProperty("骞虫柟姣背")
+    private String pingfang;
     @ExcelProperty("鎶ュ伐宸ュ簭")
     private String thisProcess;
     @ExcelProperty("鍒涘缓浜�")
     private String creator;
     @ExcelProperty("鎶ュ伐缂栧彿")
     private String reportingWorkId;
-    @ExcelProperty("鍘氬害")
-    private String thickness;
+
 }

--
Gitblit v1.8.0