From febc34d3642ad7d1b68be5ac49eea48089b3e2e0 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 12 四月 2024 15:46:28 +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 |    3 ++-
 1 files changed, 2 insertions(+), 1 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..c4ff1c0 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")
@@ -37,7 +38,7 @@
     //@TableField(select = false)
 //   @ManyToOne(fetch = FetchType.LAZY)
     @TableField(select = false,exist = false)
-    private  OrderDetail orderDetail;
+    private OrderDetail  orderDetail;
 
 
 }

--
Gitblit v1.8.0