From e51e45f2cabcc4628ce93e55c7c3806b1b760161 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 11 八月 2025 16:26:23 +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/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 4c52000..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
@@ -43,10 +43,17 @@
private String inventoryArea;
@ExcelProperty("澶囨敞")
private String remarks;
+ @ExcelProperty("宸ョ▼鍙�")
+ private String projectNo;
@ExcelProperty("鎿嶄綔浜�")
private String operator;
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDate operateTime;
+ @ExcelProperty("浼樺寲浣跨敤鏁伴噺")
+ private Integer useCount;
+
+ private MaterialOutbound materialOutbound;
+
}
--
Gitblit v1.8.0