From c7631c62aac9c97e80ed59ebb2eebd4a314e0784 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 19 四月 2024 13:55:15 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 71d42f5..6da7abe 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,7 +4,9 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.example.erp.entity.mm.FinishedGoodsInventory;
+import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
import java.time.LocalDate;
@@ -33,20 +35,27 @@
private String edgingType;
private Double weight;
private Double perimeter;
+ private String otherColumns;
private Integer warehouseNum;
private Integer deliveryNum;
private Integer returnNum;
private Integer state;
private LocalDate createTime;
private LocalDate updateTime;
- @TableField(select = false)
+ @TableField(select = false,exist= false)
private Order order;
- @TableField(select = false)
+ @TableField(select = false,exist= false)
private Delivery delivery;
- @TableField(select = false)
+ @TableField(select = false,exist= false)
private DeliveryDetail deliveryDetail;
- @TableField(select = false)
+ @TableField(select = false,exist= false)
private FinishedGoodsInventory finishedGoodsInventory;
+ @TableField(exist= false)
+ private String levelOne;
+ @TableField(exist= false)
+ private String levelTwo;
+ @TableField(exist= false)
+ private String totalThickness;
//private Product product;
}
--
Gitblit v1.8.0