diff --git a/Learn.Archives.API/Controllers/StudentController.cs b/Learn.Archives.API/Controllers/StudentController.cs index c3ab5dc..d0c9a20 100644 --- a/Learn.Archives.API/Controllers/StudentController.cs +++ b/Learn.Archives.API/Controllers/StudentController.cs @@ -209,7 +209,7 @@ namespace Learn.Archives.API.Controllers UserCenterId = s.Id, ReliefApplication=s.ReliefApplication?.Contains("已申请")??false, ReliefSubTime = s.ReliefSubTime, - ReliefType =s.ReliefType?.ToEnum() + ReliefType =s.ReliefType, }); userCenterImp.Add(new UserExcelExportData() { diff --git a/Learn.Archives.Core/Model/Enum/ReliefSubTimeEnum.cs b/Learn.Archives.Core/Model/Enum/ReliefSubTimeEnum.cs deleted file mode 100644 index 4f7815a..0000000 --- a/Learn.Archives.Core/Model/Enum/ReliefSubTimeEnum.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Learn.Archives.Core.Model.Enum -{ - /// - /// 学生减免类型 - /// - public enum ReliefSubTimeEnum - { - 低保户 = 10, - 教师子女 = 20, - 孤儿 = 30, - 艺体生 = 40, - 残疾学生 = 50, - 领导特殊承诺减免 = 60, - 领导同意的特殊贫困减免 = 70, - 建卡贫困户 = 80, - } -} diff --git a/Learn.Archives.Core/Model/Student.cs b/Learn.Archives.Core/Model/Student.cs index 5791ec4..81c5618 100644 --- a/Learn.Archives.Core/Model/Student.cs +++ b/Learn.Archives.Core/Model/Student.cs @@ -34,8 +34,8 @@ namespace Learn.Archives.Core.Model /// /// 减免申请类型 /// - [SugarColumn(IsNullable = true)] - public ReliefSubTimeEnum? ReliefType { get; set; } + [SugarColumn(IsNullable = true, Length = 20)] + public string? ReliefType { get; set; } /// /// 减免申请时间 ///