From a99c1f36e52c75e0020127c62d39c1eddae4a036 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 28 七月 2025 17:07:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/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 6596829..4da708b 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
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.example.erp.entity.mm.FinishedGoodsInventory;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,6 +14,7 @@
 import java.util.List;
 
 @Data
+@TableName("sd.`order_detail`")
 public class OrderDetail {
     @TableId(type = IdType.AUTO)
     private Long id;
@@ -44,6 +46,9 @@
     private Integer deliveryNum;
     private Integer returnNum;
     private Integer state;
+    private String fileName;
+    @TableField(select = false,exist= false)
+    private String fileData;
     private LocalDate createTime;
     private LocalDate updateTime;
     @TableField(select = false,exist= false)
@@ -67,4 +72,13 @@
     private Integer differentSize;//鐢ㄤ簬鏍囩鎵撳嵃鏃�  鏄庣粏鏄惁鏄剧ず
     //private Product product;
 
+    @TableField(exist= false,select = false)
+    private String processId;
+    @TableField(exist= false,select = false)
+    private String baiscQuantity;
+    @TableField(exist= false,select = false)
+    private Integer landingSequence;
+    @TableField(exist= false,select = false)
+    private Double thickness;
+
 }

--
Gitblit v1.8.0