From 0cd95d98fdf7ed22d53398242feb2a3ca185cf09 Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周二, 13 5月 2025 15:38:35 +0800 Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo --- Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs | 48 ++++++++++++------------------------------------ 1 files changed, 12 insertions(+), 36 deletions(-) diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs" index 92b76ef..77583d2 100644 --- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs" +++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs" @@ -137,58 +137,34 @@ public string RedundantField3 { get; set; } /// <summary> - /// 鎺掑簭 - /// </summary> - [ExcelColumn(Name = "鎺掑簭", Width = 25)] - public int Sort { get; set; } - - /// <summary> /// 澶囨敞 /// </summary> [ExcelColumn(Name = "澶囨敞", Width = 25)] public string Remark { get; set; } /// <summary> - /// 鏄惁绂佺敤 + /// 鍒涘缓鏃堕棿 /// </summary> - [ExcelColumn(Name = "鏄惁绂佺敤", Width = 25)] - public bool? IsDisabled { get; set; } + [ExcelColumn(Name = "鍒涘缓鏃堕棿", Width = 25)] + public DateTime CreationTime { get; set; } /// <summary> - /// 鍒犻櫎鏃堕棿 + /// 淇敼鏃堕棿 /// </summary> - [ExcelColumn(Name = "鍒犻櫎鏃堕棿", Width = 25)] - public DateTime DeletionTime { get; set; } + [ExcelColumn(Name = "淇敼鏃堕棿", Width = 25)] + public DateTime LastModificationTime { get; set; } /// <summary> - /// 鎿嶄綔澶囨敞 + /// 鍒涘缓浜� /// </summary> - [ExcelColumn(Name = "鎿嶄綔澶囨敞", Width = 25)] - public string OperationRemark { get; set; } + [ExcelColumn(Name = "鍒涘缓浜�", Width = 25)] + public string CreatorName { get; set; } /// <summary> - /// 鍒犻櫎澶囨敞 + /// 淇敼浜� /// </summary> - [ExcelColumn(Name = "鍒犻櫎澶囨敞", Width = 25)] - public string DeleteRemark { get; set; } - - /// <summary> - /// 鎵╁睍瀛楁1 - /// </summary> - [ExcelColumn(Name = "鎵╁睍瀛楁1", Width = 25)] - public string ExtraField1 { get; set; } - - /// <summary> - /// 鎵╁睍瀛楁2 - /// </summary> - [ExcelColumn(Name = "鎵╁睍瀛楁2", Width = 25)] - public string ExtraField2 { get; set; } - - /// <summary> - /// 鎵╁睍瀛楁3 - /// </summary> - [ExcelColumn(Name = "鎵╁睍瀛楁3", Width = 25)] - public string ExtraField3 { get; set; } + [ExcelColumn(Name = "淇敼浜�", Width = 25)] + public string LastModifierName { get; set; } -- Gitblit v1.9.3