From 65e918de84f0798f208d4a8222393623e890d556 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期六, 03 二月 2024 13:27:09 +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 | 8 +++++---
1 files changed, 5 insertions(+), 3 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 6e65b5b..1492691 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.example.erp.entity.mm.FinishedGoodsInventory;
import lombok.Data;
import java.time.LocalDate;
@@ -9,9 +10,8 @@
@Data
public class OrderDetail {
@TableId(type = IdType.AUTO)
-
private Long id;
-
+ private String orderId;
private Integer orderNumber;
private String buildingNumber;
private Integer productId;
@@ -38,8 +38,10 @@
private Integer state;
private LocalDate createTime;
private LocalDate updateTime;
-
private Order order;
+ private Delivery delivery;
+ private DeliveryDetail deliveryDetail;
+ private FinishedGoodsInventory finishedGoodsInventory;
//private Product product;
}
--
Gitblit v1.8.0