From 58268d802176436e8282fc701c1aac76bc97cd90 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 28 八月 2025 16:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/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 4da708b..f5d33f7 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
@@ -44,16 +44,21 @@
private String otherColumns;
private Integer warehouseNum;
private Integer deliveryNum;
+ private Integer outStockNum;
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