From 9b362b55344d0c854355eb2db1de84219b53a77e Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 29 十二月 2025 16:35:48 +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 | 14 ++++++++++++++
1 files changed, 14 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 f5d33f7..ff22166 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
@@ -12,6 +12,7 @@
import java.time.LocalDate;
import java.util.List;
+import java.util.Map;
@Data
@TableName("sd.`order_detail`")
@@ -36,6 +37,7 @@
private String processingNote;
private String remarks;
private Double bendRadius;
+ private String processAttribute;
private String edgingType;
private Double archRise;
private Double weight;
@@ -48,6 +50,8 @@
private Integer returnNum;
private Integer state;
private String fileName;
+ @TableField(select = false,exist= false)
+ private Integer fileId;
@TableField(select = false,exist= false)
private String fileData;
@TableField(select = false,exist= false)
@@ -85,5 +89,15 @@
private Integer landingSequence;
@TableField(exist= false,select = false)
private Double thickness;
+ @TableField(exist= false,select = false)
+ private Map<String, Object> otherColumnsJson;
+
+ //鐢ㄤ簬鏅鸿兘鍒嗘灦
+ @TableField(exist= false,select = false)
+ private Double longSide;
+
+ //鐢ㄤ簬鏅鸿兘鍒嗘灦
+ @TableField(exist= false,select = false)
+ private Double shortSide;
}
--
Gitblit v1.8.0