From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +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/entity/pp/ReportingWorkDetail.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
index 4268c23..079c6e0 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
@@ -30,6 +30,10 @@
     private String breakageReason;
     //绫诲瀷
     private String breakageType;
+    //瀹�
+    private Double childWidth;
+    //楂�
+    private Double childHeight;
     //鍙埄鐢�
     private Integer available;
     //閫�鍥炲伐搴�
@@ -69,6 +73,10 @@
     //杩斿伐闈㈢Н
    // private double reworkArea;
 
+    //鎶ュ伐淇敼鐢ㄨˉ鐗囩姸鎬�
+    @TableField(select = false,exist= false)
+    private String patchStatusOther;
+
     //娆$牬鍒楄〃
     @TableField(select = false,exist= false)
     private List<DamageDetails>

--
Gitblit v1.8.0