From ebd55233e37a6c050fda335be6c2c67630b1f7e3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 13 三月 2024 10:30:42 +0800
Subject: [PATCH] 拉取文件

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java
index 86d5256..bb4f0f4 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java
@@ -1,10 +1,14 @@
 package com.example.erp.entity.pp;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.example.erp.entity.sd.Order;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 @Data
 public class ReportingWork {
     @TableId(type = IdType.AUTO)
@@ -39,9 +43,9 @@
     //鐝
     private String classes;
     //鐝粍缂栧彿
-    private String teamsgroupsId;
+    private String teamsGroupsId;
     //鐝粍鍚嶇О
-    private String teamsgroupsName;
+    private String teamsGroupsName;
     //鎶ュ伐鐘舵��
     private Integer reportingWorkState;
     //瀹℃牳浜�
@@ -51,11 +55,11 @@
     //澶囨敞
     private String notes;
     //璐ㄦ鍛�
-    private String qualityInsPector;
+    private String qualityInspector;
     //鍖呰鏂瑰紡
     private String packagingMethod;
     //鎶ュ伐鏃堕棿
-    private LocalDate reportingWorkTime;
+    private LocalDateTime reportingWorkTime;
     //瀹℃牳鏃堕棿
     private LocalDate examineTime;
     //璐ㄦ鏃堕棿
@@ -65,6 +69,18 @@
     //淇敼鏃堕棿
     private LocalDate updateTime;
 
+    //鍒涘缓鑰�
+    private String creatorId ;
+    private String creator ;
+
+
+    @TableField(select = false,exist= false)
+    private Order order;
     //澶栭敭娴佺▼鍗¤〃
+    @TableField(select = false,exist= false)
     private FlowCard flowCard;
+//    @TableField(select = false,exist= false)
+//    private ReportingWork reportingWork;
+    @TableField(select = false,exist= false)
+    private  ReportingWorkDetail reportingWorkDetail;
 }

--
Gitblit v1.8.0