From 15fa56463061f1e94140e23e98987aa3131714bf Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 25 七月 2024 17:24:32 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/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 6c36b81..91f192e 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
@@ -7,6 +7,7 @@
import lombok.Data;
import java.time.LocalDate;
+import java.util.List;
@Data
@TableName("sd.order_glass_detail")
@@ -23,6 +24,7 @@
private Double childHeight;
private Double area;
private Double totalArea;
+ private Double arc;//寮ч暱
private String icon;
private String process;
private String productionId;
@@ -32,12 +34,9 @@
private Integer group;
private LocalDate productionTime;
private LocalDate createTime;
+
@TableField(select = false,exist = false)
private Order order;
- //@TableField(select = false)
-// @ManyToOne(fetch = FetchType.LAZY)
@TableField(select = false,exist = false)
- private OrderDetail orderDetail;
-
-
+ private OrderDetail orderDetail;
}
--
Gitblit v1.8.0