From d56944a1e0776da3f270353a902d5954e3373cee Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 19 六月 2024 09:46:16 +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/OrderDetail.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
index 223d14e..ce4a702 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
@@ -10,6 +10,7 @@
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDate;
+import java.util.List;
 
 @Data
 public class OrderDetail {
@@ -52,6 +53,9 @@
     private DeliveryDetail deliveryDetail;
     @TableField(select = false,exist= false)
     private FinishedGoodsInventory finishedGoodsInventory;
+    @TableField(select = false,exist= false)
+    private List<OrderGlassDetail> orderGlassDetails;
+
     @TableField(exist= false)
     private String levelOne;
     @TableField(exist= false)

--
Gitblit v1.8.0