From 37175875537a92930a19688ad1cc2c49fb415f0f Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 01 八月 2025 14:41:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialLog.java b/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialLog.java
index 3ecc6bb..75063e7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialLog.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialLog.java
@@ -53,5 +53,7 @@
     @ExcelProperty("浼樺寲浣跨敤鏁伴噺")
     private Integer useCount;
 
+    private MaterialOutbound materialOutbound;
+
 
 }

--
Gitblit v1.8.0