dev #4

Merged
hy merged 2 commits from dev into staging 2025-08-26 10:10:35 +08:00
3 changed files with 3 additions and 26 deletions
Showing only changes of commit 96b481ef9b - Show all commits

View File

@ -209,7 +209,7 @@ namespace Learn.Archives.API.Controllers
UserCenterId = s.Id,
ReliefApplication=s.ReliefApplication?.Contains("已申请")??false,
ReliefSubTime = s.ReliefSubTime,
ReliefType =s.ReliefType?.ToEnum<ReliefSubTimeEnum>()
ReliefType =s.ReliefType,
});
userCenterImp.Add(new UserExcelExportData()
{

View File

@ -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
{
/// <summary>
/// 学生减免类型
/// </summary>
public enum ReliefSubTimeEnum
{
= 10,
= 20,
= 30,
= 40,
= 50,
= 60,
= 70,
= 80,
}
}

View File

@ -34,8 +34,8 @@ namespace Learn.Archives.Core.Model
/// <summary>
/// 减免申请类型
/// </summary>
[SugarColumn(IsNullable = true)]
public ReliefSubTimeEnum? ReliefType { get; set; }
[SugarColumn(IsNullable = true, Length = 20)]
public string? ReliefType { get; set; }
/// <summary>
/// 减免申请时间
/// </summary>