From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +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/MaterialLog.java | 7 +++++++
1 files changed, 7 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 5d74b7a..181a851 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
@@ -50,5 +50,12 @@
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDate operateTime;
+ @ExcelProperty("浼樺寲浣跨敤鏁伴噺")
+ private Integer useCount;
+
+ private MaterialOutbound materialOutbound;
+
+ private MaterialOutboundDetail materialOutboundDetail;
+
}
--
Gitblit v1.8.0