From a6f59f0908e5787d55c098c17f4eec365cf6477a Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 23 十一月 2024 11:41:25 +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, 7 insertions(+), 3 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 0f0d17c..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
@@ -23,9 +23,9 @@
//宸ヨ壓纭搴忓彿
private String technologyNumber;
//瀹屽伐鏁伴噺
- private Integer completedQuantity;
+ private int completedQuantity;
//娆＄牬鏁伴噺
- private Integer breakageQuantity;
+ private int breakageQuantity;
//娆＄牬鍘熷洜
private String breakageReason;
//绫诲瀷
@@ -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