From 8a63774671aef17807569d6fb631eca20d4696f0 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 25 八月 2025 17:04:46 +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 | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 f9c1ced..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
@@ -46,10 +46,17 @@
private Integer deliveryNum;
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)
@@ -76,6 +83,6 @@
@TableField(exist= false,select = false)
private Integer landingSequence;
@TableField(exist= false,select = false)
- private Integer thickness;
+ private Double thickness;
}
--
Gitblit v1.8.0