Merge commit '08c7a11ec0' into develop
# Conflicts: # Migrations/ApplicationDbContextModelSnapshot.cs # bin/Debug/net7.0/BMA.EHR.Recruit.Service.deps.json # bin/Debug/net7.0/BMA.EHR.Recruit.Service.dll # bin/Debug/net7.0/BMA.EHR.Recruit.Service.exe # bin/Debug/net7.0/BMA.EHR.Recruit.Service.pdb # bin/Debug/net7.0/BMA.EHR.Recruit.Service.runtimeconfig.json # bin/Debug/net7.0/BMA.EHR.Recruit.Service.staticwebassets.runtime.json # bin/Debug/net7.0/BMA.EHR.Recruit.Service.xml # obj/BMA.EHR.Recruit.Service.csproj.nuget.dgspec.json # obj/BMA.EHR.Recruit.Service.csproj.nuget.g.props # obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs # obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache # obj/Debug/net7.0/BMA.EHR.Recruit.Service.GeneratedMSBuildEditorConfig.editorconfig # obj/Debug/net7.0/BMA.EHR.Recruit.Service.GlobalUsings.g.cs # obj/Debug/net7.0/BMA.EHR.Recruit.Service.MvcApplicationPartsAssemblyInfo.cs # obj/Debug/net7.0/BMA.EHR.Recruit.Service.assets.cache # obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.CoreCompileInputs.cache # obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.FileListAbsolute.txt # obj/Debug/net7.0/BMA.EHR.Recruit.Service.dll # obj/Debug/net7.0/BMA.EHR.Recruit.Service.genruntimeconfig.cache # obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb # obj/Debug/net7.0/BMA.EHR.Recruit.Service.xml # obj/Debug/net7.0/Sentry.Attributes.cs # obj/Debug/net7.0/ref/BMA.EHR.Recruit.Service.dll # obj/Debug/net7.0/refint/BMA.EHR.Recruit.Service.dll # obj/Debug/net7.0/staticwebassets.build.json # obj/Debug/net7.0/staticwebassets.development.json # obj/Debug/net7.0/staticwebassets/msbuild.build.BMA.EHR.Recruit.Service.props # obj/Debug/net7.0/staticwebassets/msbuild.buildMultiTargeting.BMA.EHR.Recruit.Service.props # obj/Debug/net7.0/staticwebassets/msbuild.buildTransitive.BMA.EHR.Recruit.Service.props # obj/project.assets.json # obj/project.nuget.cache
This commit is contained in:
commit
045d407938
42 changed files with 25814 additions and 49 deletions
|
|
@ -8,7 +8,7 @@ namespace BMA.EHR.Recruit.Service.Models.Recruits
|
|||
[Required, MaxLength(50)]
|
||||
public string ExamId { get; set; }
|
||||
|
||||
public int SumA { get; set; }
|
||||
public double SumA { get; set; }
|
||||
|
||||
public int FullA { get; set; }
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ namespace BMA.EHR.Recruit.Service.Models.Recruits
|
|||
[MaxLength(50)]
|
||||
public string AStatus { get; set; }
|
||||
|
||||
public int SumB { get; set; }
|
||||
public double SumB { get; set; }
|
||||
|
||||
public int FullB { get; set; }
|
||||
|
||||
|
|
@ -26,12 +26,12 @@ namespace BMA.EHR.Recruit.Service.Models.Recruits
|
|||
[MaxLength(50)]
|
||||
public string BStatus { get; set; }
|
||||
|
||||
public int SumAB { get; set; }
|
||||
public double SumAB { get; set; }
|
||||
|
||||
[Required, MaxLength(50)]
|
||||
public string ABStatus { get; set; }
|
||||
|
||||
public int SumC { get; set; }
|
||||
public double SumC { get; set; }
|
||||
|
||||
public int FullC { get; set; }
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue