From 1b86547ddc47a96e86eb376d0a381814ad621fd0 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 22 二月 2024 08:13:31 +0800
Subject: [PATCH] 提交产品界面

---
 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java |   18 ++++++++++++++----
 1 files changed, 14 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 2d9d3fc..3f032e8 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
@@ -1,19 +1,23 @@
 package com.example.erp.entity.sd;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+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;
 
 @Data
 public class OrderDetail {
     @TableId(type = IdType.AUTO)
-
     private Long id;
-
+    private String orderId;
     private Integer orderNumber;
     private String buildingNumber;
+    private Integer productId;
     private String productName;
     private Double price;
     private Long quantity;
@@ -37,8 +41,14 @@
     private Integer state;
     private LocalDate createTime;
     private LocalDate updateTime;
-
+    @TableField(select = false)
     private Order order;
-    private Product product;
+    @TableField(select = false)
+    private Delivery delivery;
+    @TableField(select = false)
+    private DeliveryDetail deliveryDetail;
+    @TableField(select = false)
+    private FinishedGoodsInventory finishedGoodsInventory;
+    //private Product product;
 
 }

--
Gitblit v1.8.0