From cbcf5944ab612775f3b1341769cc72ff84087d76 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 20 二月 2024 16:03:13 +0800
Subject: [PATCH] 工艺流程修改前端和后端文件提交

---
 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
index d2a4f66..ef94a1c 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
@@ -1,9 +1,14 @@
 package com.example.erp.entity.sd;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import java.time.LocalDate;
 
 @Data
@@ -22,11 +27,14 @@
     private String productionId;
     private Integer splittingStatus;
     private String founder;
+    @TableField(value = "`group`")
     private Integer group;
-    private LocalDate produtionTime;
+    private LocalDate productionTime;
     private LocalDate createTime;
-
-    private  Order order;
+//    @TableField(select = false)
+//    private  Order order;
+    //@TableField(select = false)
+//   @ManyToOne(fetch = FetchType.LAZY)
     private  OrderDetail orderDetail;
 
 

--
Gitblit v1.8.0