From 3d9e0ec1c1e457ed3fd2b334cf4c4dd66c10eead Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 23 十二月 2025 11:09:46 +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 |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 d471eb9..5813c8c 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
@@ -1,6 +1,7 @@
 package com.example.erp.entity.mm;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.example.erp.entity.sd.*;
 import lombok.Data;
@@ -25,8 +26,15 @@
     private String remark;
     private LocalDate updateTime;
     private LocalDate endTime;
-
+    private String processId;
+    private String boxNo;
+    private Double computeArea;
+    private Double computeGrossArea;
+    @TableField(select = false,exist = false)
     private Order order;
+    @TableField(select = false,exist = false)
     private OrderDetail orderDetail;
+    @TableField(select = false,exist = false)
+    private Double weight;
 
 }

--
Gitblit v1.8.0