From c12e4a831b4210ec886b2537824a464d74b59ff5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 10 三月 2025 14:46:28 +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/TeamOutputDTO.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
index 8230fcc..c6121cb 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
@@ -25,10 +25,10 @@
     private String width;
     @ExcelProperty("楂�")
     private String height;
-    @ExcelProperty("褰㈢姸")
-    private String shape;
-    @ExcelProperty("鍘氬害")
-    private String thickness;
+//    @ExcelProperty("褰㈢姸")
+//    private String shape;
+//    @ExcelProperty("鍘氬害")
+//    private String thickness;
     @ExcelProperty("纾ㄨ竟绫诲瀷")
     private String edgingType;
     @ExcelProperty("瀹屽伐鏁伴噺")

--
Gitblit v1.8.0