From 900b4223386a8010e80f1091c4371c19e9117d63 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 27 二月 2024 13:50:42 +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/sd/OrderGlassDetail.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 ef94a1c..e2f059f 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
@@ -3,12 +3,8 @@
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
@@ -23,6 +19,9 @@
private String glassChild;
private Double childWidth;
private Double childHeight;
+ private Double area;
+ private Double totalArea;
+ private String icon;
private String process;
private String productionId;
private Integer splittingStatus;
@@ -32,7 +31,7 @@
private LocalDate productionTime;
private LocalDate createTime;
// @TableField(select = false)
-// private Order order;
+ private Order order;
//@TableField(select = false)
// @ManyToOne(fetch = FetchType.LAZY)
private OrderDetail orderDetail;
--
Gitblit v1.8.0