From 1acfd0dc4f695165dab633b5f45acc48047eb1b6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 14 5月 2025 11:22:01 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialsExportModel.cs |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialsExportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialsExportModel.cs
index 3a90013..fe081f9 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialsExportModel.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialsExportModel.cs
@@ -16,7 +16,7 @@
         /// </summary>
         /// <example>MAT-2023-001</example>
         [ExcelColumn(Name = "鐗╂枡缂栫爜", Width = 25)]
-        public string MaterialCode { get; set; }
+        public string MaterialNo { get; set; }
 
         /// <summary>
         /// 鐗╂枡鍚嶇О
@@ -81,6 +81,11 @@
         public string MaterialQuality { get; set; }
 
         /// <summary>
+        /// 鍨嬪彿
+        /// </summary>
+        [ExcelColumn(Name = "鍨嬪彿", Width = 25)]
+        public string MaterialModel { get; set; }
+        /// <summary>
         /// 闀垮害锛堝崟浣嶏細绫筹級
         /// </summary>
         /// <example>6.0</example>

--
Gitblit v1.9.3