From d111849e6e78ed02a63661e31c81dadd65f53104 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 01 十二月 2025 13:28:45 +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 | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 bc78e65..eae38a9 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
@@ -18,9 +18,9 @@
@ExcelProperty("娴佺▼鍗″彿")
private String processId;
@ExcelProperty("璁㈠崟搴忓彿")
- private String orderNumber;
+ private Integer orderNumber;
@ExcelProperty("灏忕墖椤哄簭")
- private String technologyNumber;
+ private Integer technologyNumber;
@ExcelProperty("鎶ュ伐鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime reportingWorkTime;
@@ -45,8 +45,13 @@
@ExcelProperty("缂栧彿")
private String glassNumber;
@ExcelProperty("瀹�")
- private String childWidth;
+ private Double childWidth;
@ExcelProperty("楂�")
- private String childHeight;
-
+ private Double childHeight;
+ @ExcelProperty("鎶ュ伐宸ュ簭")
+ private String thisProcess;
+ @ExcelProperty("鍒涘缓浜�")
+ private String creator;
+ @ExcelProperty("鎶ュ伐缂栧彿")
+ private String reportingWorkId;
}
--
Gitblit v1.8.0