From 8c6aad555647fcecaddfaed99516d8b93db837c8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 01 四月 2026 11:18:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/dto/ProductMaterialSkuImportDto.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductMaterialSkuImportDto.java b/src/main/java/com/ruoyi/production/dto/ProductMaterialSkuImportDto.java
index 9d6c599..0441463 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductMaterialSkuImportDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductMaterialSkuImportDto.java
@@ -27,6 +27,10 @@
@Excel(name = "瑙勬牸鍨嬪彿")
private String model;
+ @ApiModelProperty("鐗╂枡缂栫爜")
+ @Excel(name = "鐗╂枡缂栫爜")
+ private String materialCode;
+
@ApiModelProperty("渚涘簲鏂瑰紡锛堣嚜鍒讹紝澶栬喘锛�")
@Excel(name = "渚涘簲鏂瑰紡")
private String supplyType;
--
Gitblit v1.9.3