From decd9f8bf3e6119efce34e6bbc0c320a2a2446c1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 02 二月 2024 15:41:50 +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/mm/FinishedGoodsInventory.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java b/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java
index 40f2159..d471eb9 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java
@@ -12,9 +12,9 @@
@TableId(type = IdType.AUTO)
private Long id;
- private Order order;
- private OrderDetail orderDetail;
- private Integer inventory ;
+ private String orderId;
+ private Integer orderNumber;
+ private Integer inventory;
private Double actualSignalArea;
private Double area;
private Integer quantityAvailable;
@@ -26,4 +26,7 @@
private LocalDate updateTime;
private LocalDate endTime;
+ private Order order;
+ private OrderDetail orderDetail;
+
}
--
Gitblit v1.8.0