From 054c4b3be788b870026fdd1da916be18931161e7 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 30 4月 2025 16:24:31 +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 | 16 +++++++++++++++-
1 files changed, 15 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 e13f3d6..3a90013 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
@@ -93,7 +93,7 @@
/// <example>true</example>
[ExcelColumn(Name = "鏄惁涓绘敮绠�", Width = 25)]
[Description("鏄�/鍚�")]
- public bool IsMainBranch { get; set; }
+ public YesNoEnum IsMainBranch { get; set; }
/// <summary>
/// 鐢熶骇宸ュ巶鍚嶇О
@@ -136,8 +136,22 @@
[ExcelColumn(Name = "鎵╁睍瀛楁3", Width = 25)]
public string RedundantField3 { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
[ExcelColumn(Name = "澶囨敞",Width = 25)]
public string Remark { get; set; }
+
+ public Dictionary<string, object> GetExportData()
+ {
+ var exportData = new Dictionary<string, object>();
+ foreach (var property in this.GetType().GetProperties())
+ {
+ exportData.Add(property.Name, property.GetValue(this));
+ }
+
+ return exportData;
+ }
}
}
--
Gitblit v1.9.3