From fb9a4fdf9ba08eaf300803dff945e0e431b717c4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 13 十月 2025 10:35:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/aerjiliya' into aerjiliya

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWorkDetail.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWorkDetail.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWorkDetail.java
index f2402c2..cb27704 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWorkDetail.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWorkDetail.java
@@ -149,6 +149,6 @@
      */
     private LocalDateTime reworkUpdateTime;
 
-    private List<DamageDetails> damageDetailsList;
+    private List<DamageDetails> damageDetails;
 
 }

--
Gitblit v1.8.0