From 77c7984fb636f81a87208aea2bcffc701f6419e8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 23 十月 2024 16:01:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java |    6 +++++-
 1 files changed, 5 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..1a207ad 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
@@ -59,7 +59,7 @@
     //寰呰繑宸ユ暟閲�
     private Integer waitReworkQuantity;
     //杩斿伐瀹℃牳鐘舵��
-    private Integer reviewerState;
+    private Integer reviewStatus;
     //杩斿伐瀹℃牳浜�
     private String reviewer;
     //杩斿伐鏃堕棿
@@ -69,6 +69,10 @@
     //杩斿伐闈㈢Н
    // private double reworkArea;
 
+    //鎶ュ伐淇敼鐢ㄨˉ鐗囩姸鎬�
+    @TableField(select = false,exist= false)
+    private String patchStatusOther;
+
     //娆$牬鍒楄〃
     @TableField(select = false,exist= false)
     private List<DamageDetails>

--
Gitblit v1.8.0