From 37175875537a92930a19688ad1cc2c49fb415f0f Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 01 八月 2025 14:41:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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