From a158ed9136af588b82d365f98074b29c70cdb601 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 08 八月 2025 15:58:35 +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 |    5 +++++
 1 files changed, 5 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 38fbe40..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
@@ -46,11 +46,16 @@
     private Integer deliveryNum;
     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