From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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/Rework.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/Rework.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/Rework.java
index 7a5aa60..03f2fe8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/Rework.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/Rework.java
@@ -1,10 +1,13 @@
 package com.example.erp.entity.pp;
 
-import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
 
+import java.time.LocalDate;
+@Data
 public class Rework {
     //鑷id
-    private Integer id;
+    private Long id;
     //杩斿伐缂栧彿
     private String reworkId;
     //娴佺▼鍗″彿
@@ -30,6 +33,16 @@
     //淇敼鏃堕棿
     private LocalDate updateTime;
 
+    private String orderId;
+    private String responsiblePersonnel;
+    private String orderSort;
+    private Integer technologyNumber;
+    private String responsibleTeam;
+    private String qualityInspector;
+    private String responsibleEquipment;
+    private String reportingWorkId;
+
     //澶栭敭娴佺▼鍗¤〃
+    @TableField(select = false,exist= false)
     private FlowCard flowCard;
 }

--
Gitblit v1.8.0