From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 470cac8..3395529 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,17 @@
private Integer returnNum;
private Integer state;
private String fileName;
+ @TableField(select = false,exist= false)
private String fileData;
+ @TableField(select = false,exist= false)
+ private String fileJson;
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