From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/Rework.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 b42f53f..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,12 +1,13 @@
 package com.example.erp.entity.pp;
 
+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;
     //娴佺▼鍗″彿
@@ -32,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