Merge branch 'feature/exam' into dev

合并冲突

src/Hotline.Application/Exam/Service/Questions/QuestionService.cs

@@ -36,11 +36,6 @@ using Hotline.Exams.ExamManages;
 using Hotline.Exams.Questions;
 using Hotline.Repository.SqlSugar.Exam.Repositories;
 using Hotline.Share.Dtos.TestPapers;
-using ExamQuestion = Hotline.Exams.Questions.ExamQuestion;
-using ExamQuestionAnswer = Hotline.Exams.Questions.ExamQuestionAnswer;
-using ExamQuestionKnowladge = Hotline.Exams.Questions.ExamQuestionKnowladge;
-using ExamQuestionOptions = Hotline.Exams.Questions.ExamQuestionOptions;
-using ExamQuestionSourceware = Hotline.Exams.Questions.ExamQuestionSourceware;
 using Hotline.Repository.SqlSugar.Exam.Service;
 using Hotline.Repository.SqlSugar.Exam.Extensions;
 

src/Hotline.Repository.SqlSugar/Exam/Validators/Sourcewares/SourcewareCategoryValidator.cs

@@ -46,7 +46,6 @@ namespace Exam.Repository.Sqlsugar.Validators.Sourcewares
         {
             base.BaseValidateRule();
             RuleFor(m => m.Name).NotEmpty().WithMessage(x => string.Format(ExamErrorMessage.IsRequired, x.GetType().GetDescription(nameof(ExamSourcewareCategory.Name))));
-            RuleFor(m => m.SortIndex).NotEmpty().WithMessage(x => string.Format(ExamErrorMessage.IsRequired, x.GetType().GetDescription(nameof(ExamSourcewareCategory.SortIndex))));
         }
 
         protected override void ValidateRuleWithAdd()