From 464f075399dfdfc91ebe2af3a8a7e60c9be935ba Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 27 二月 2024 08:58:08 +0800
Subject: [PATCH] 发货编辑修改,分页功能修改

---
 north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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 a6eab00..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
@@ -2,8 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.example.erp.entity.sd.Customer;
-import com.example.erp.entity.sd.Order;
+import com.example.erp.entity.sd.*;
 import lombok.Data;
 
 import java.time.LocalDate;
@@ -15,16 +14,19 @@
     private Long id;
     private String orderId;
     private Integer orderNumber;
-    private Integer inventory    ;
+    private Integer inventory;
     private Double actualSignalArea;
     private Double area;
     private Integer quantityAvailable;
     private String warehouseNumber;
-    private LocalDate storageRegion;
+    private String storageRegion;
     private Integer status;
     private LocalDate enterStorageTime;
     private String remark;
     private LocalDate updateTime;
     private LocalDate endTime;
 
+    private Order order;
+    private OrderDetail orderDetail;
+
 }

--
Gitblit v1.8.0