From 320cf0daf4c78fd27cfd714782d614bfb6adb4e0 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Fri, 28 Feb 2025 09:18:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=AE=A1=E5=88=92=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Tiobon.Web.pdm | 6 +++--- Tiobon.Core.Api/Tiobon.Core.Model.xml | 4 ++-- Tiobon.Core.Model/Base/Ghre/Ghre_Plan.Dto.Base.cs | 4 ++-- Tiobon.Core.Model/Models/Ghre/Ghre_Plan.cs | 4 ++-- Tiobon.Core.Services/Ghre/Ghre_PlanServices.cs | 2 +- Tiobon.Core/Tiobon.Core.Model.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 629214c6..57f4e5fd 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -51974,10 +51974,10 @@ Ghra_staff_InsureBase 024B4C8E-5ABD-4280-9BBE-B62E1F16CC16 类别 -PlanType +TrainCategory 1740635904 Administrator -1740637965 +1740704848 Administrator 类别 nvarchar(32) diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index ca69972f..c6d2f835 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -5605,7 +5605,7 @@ 年份 - + 类别 @@ -20806,7 +20806,7 @@ 年份 - + 类别 diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_Plan.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_Plan.Dto.Base.cs index 30ba1765..812c310e 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_Plan.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_Plan.Dto.Base.cs @@ -31,8 +31,8 @@ public class Ghre_PlanBase /// /// 类别 /// - [Display(Name = "PlanType"), Description("类别"), MaxLength(32, ErrorMessage = "类别 不能超过 32 个字符")] - public string PlanType { get; set; } + [Display(Name = "TrainCategory"), Description("类别"), MaxLength(32, ErrorMessage = "类别 不能超过 32 个字符")] + public string TrainCategory { get; set; } /// /// 部门ID diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_Plan.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_Plan.cs index 6967adef..2aee6838 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_Plan.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_Plan.cs @@ -32,8 +32,8 @@ public class Ghre_Plan : BasePoco /// /// 类别 /// - [Display(Name = "PlanType"), Description("类别"), MaxLength(32, ErrorMessage = "类别 不能超过 32 个字符")] - public string PlanType { get; set; } + [Display(Name = "TrainCategory"), Description("类别"), MaxLength(32, ErrorMessage = "类别 不能超过 32 个字符")] + public string TrainCategory { get; set; } /// /// 部门ID diff --git a/Tiobon.Core.Services/Ghre/Ghre_PlanServices.cs b/Tiobon.Core.Services/Ghre/Ghre_PlanServices.cs index 3bfb41b1..a46b62b4 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_PlanServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_PlanServices.cs @@ -26,7 +26,7 @@ public class Ghre_PlanServices : BaseServices>(DT_TableDataT1[i].StaffIds)); - DT_TableDataT1[i].PlanType = await GetParaLabel("TrainingCategory", DT_TableDataT1[i].PlanType); + DT_TableDataT1[i].TrainCategory = await GetParaLabel("TrainingCategory", DT_TableDataT1[i].TrainCategory); DT_TableDataT1[i].Month = await GetParaLabel("MonthSelect", DT_TableDataT1[i].Month); } staffIds = staffIds.Distinct().ToList(); diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index ca69972f..c6d2f835 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -5605,7 +5605,7 @@ 年份 - + 类别 @@ -20806,7 +20806,7 @@ 年份 - + 类别