From 900b4223386a8010e80f1091c4371c19e9117d63 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 27 二月 2024 13:50:42 +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 | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 7b95b85..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,15 +1,18 @@
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;
@@ -38,9 +41,14 @@
private Integer state;
private LocalDate createTime;
private LocalDate updateTime;
+ @TableField(select = false)
private Order order;
+ @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