From e51e45f2cabcc4628ce93e55c7c3806b1b760161 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 11 八月 2025 16:26:23 +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/OrderDetail.java |    3 +++
 1 files changed, 3 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 470cac8..80f97e8 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
@@ -47,12 +47,15 @@
     private Integer returnNum;
     private Integer state;
     private String fileName;
+    @TableField(select = false,exist= false)
     private String fileData;
     private LocalDate createTime;
     private LocalDate updateTime;
     @TableField(select = false,exist= false)
     private Order order;
     @TableField(select = false,exist= false)
+    private OrderGlassDetail orderGlassDetail;
+    @TableField(select = false,exist= false)
     private Delivery delivery;
     @TableField(select = false,exist= false)
     private DeliveryDetail deliveryDetail;

--
Gitblit v1.8.0