From 43322d13c1876b1705f8ba1eb2ef32e7a433cacc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 十二月 2025 16:57:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialInventory.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialInventory.java b/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialInventory.java
index 3411943..0b93fde 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialInventory.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialInventory.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 lombok.Data;
 
@@ -23,6 +24,7 @@
     private Integer inventoryQuantity;
     private Integer availableQuantity;
     private Integer safetyStock;
+    private Integer planQuantity;
     private Double totalArea;
     private Double singlePieceArea;
     private LocalDate dateOfManufacture;
@@ -31,6 +33,8 @@
     private Integer deadStock;
     private String remarks;
     private LocalDate createTime;
+    @TableField(select = false,exist = false)
+    private String json;
 
 
 

--
Gitblit v1.8.0