From 833a285ef00a84fc1a88464eb3d7d1934cf71ff6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 四月 2026 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

---
 src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java
index d705110..a1424b3 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java
@@ -16,6 +16,8 @@
     private String productName;
     @Excel(name = "瑙勬牸鍨嬪彿")
     private String model;
+    @Excel(name = "鏂欏彿")
+    private String materialCode;
     @Excel(name = "鍗曚綅")
     private String unit;
     @Excel(name = "鍏ュ簱鏉ユ簮")

--
Gitblit v1.9.3