From 7b87ac9846e8bfdd5a7a64e4c9623408220845b8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 01 三月 2024 09:29:07 +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/ReportingWork.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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..404f103 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.example.erp.entity.sd.Order;
import lombok.Data;
import java.time.LocalDate;
@@ -39,9 +40,9 @@
//鐝
private String classes;
//鐝粍缂栧彿
- private String teamsgroupsId;
+ private String teamsGroupsId;
//鐝粍鍚嶇О
- private String teamsgroupsName;
+ private String teamsGroupsName;
//鎶ュ伐鐘舵��
private Integer reportingWorkState;
//瀹℃牳浜�
@@ -65,6 +66,11 @@
//淇敼鏃堕棿
private LocalDate updateTime;
+
+ private Order order;
//澶栭敭娴佺▼鍗¤〃
private FlowCard flowCard;
+ private ReportingWork reportingWork;
+
+ private ReportingWorkDetail reportingWorkDetail;
}
--
Gitblit v1.8.0