From 2e1553e8a7120c2d38d69a8f400dcca2557b09fb Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 26 十二月 2025 15:59:29 +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/dto/mm/MaterialLogDTO.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/mm/MaterialLogDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/mm/MaterialLogDTO.java
index ca1d906..2b62c85 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/mm/MaterialLogDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/mm/MaterialLogDTO.java
@@ -59,6 +59,8 @@
     private String batch;
     @ExcelProperty("閿�鍞崟鍙�")
     private String orderId;
+    @ExcelProperty("鐢熶骇鏃ユ湡")
+    private LocalDate dateOfManufacture;
 
 
 

--
Gitblit v1.8.0