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/basic/dto/ProductModelExportDto.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java b/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
index c8c838a..a2c3bd0 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
@@ -14,6 +14,8 @@
  */
 @Data
 public class ProductModelExportDto {
+    @Excel(name = "鐗╂枡缂栧彿")
+    private String materialCode;
 
     @Excel(name = "瑙勬牸鍨嬪彿")
     private String model;

--
Gitblit v1.9.3