From 6661232f32135d943c76197afba2baac81e171f4 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 18 七月 2025 12:00:55 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 6cac444..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;
     //閫�鍥炲伐搴�
@@ -59,7 +63,7 @@
     //寰呰繑宸ユ暟閲�
     private Integer waitReworkQuantity;
     //杩斿伐瀹℃牳鐘舵��
-    private Integer reviewerState;
+    private Integer reviewStatus;
     //杩斿伐瀹℃牳浜�
     private String reviewer;
     //杩斿伐鏃堕棿
@@ -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