From 3247273b3505b42c400251ee2fc0921affaadf40 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 29 十二月 2025 16:40:10 +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 | 6 ++++++
1 files changed, 6 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 80c15b1..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,6 +89,8 @@
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)
--
Gitblit v1.8.0