From c1c7cae9ebaa7f743e51660265c8dfa6ac52f10d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 09 十月 2025 16:07:42 +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 | 13 +++++++++++++
1 files changed, 13 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..80c15b1 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,15 +44,20 @@
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)
@@ -81,4 +86,12 @@
@TableField(exist= false,select = false)
private Double thickness;
+ //鐢ㄤ簬鏅鸿兘鍒嗘灦
+ @TableField(exist= false,select = false)
+ private Double longSide;
+
+ //鐢ㄤ簬鏅鸿兘鍒嗘灦
+ @TableField(exist= false,select = false)
+ private Double shortSide;
+
}
--
Gitblit v1.8.0