Merge branch 'feature/exam' into test

合并冲突

src/Hotline/Exams/ExamManages/ExamOfflineExamAnalysis.cs

@@ -55,15 +55,15 @@ namespace Hotline.Exams.ExamManages
         /// <summary>
         /// 考试开始时间
         /// </summary>
-        [SugarColumn(ColumnDescription = "考试开始时间")]
-        [Description("考试开始时间")]
+        [SugarColumn(ColumnDescription = "开始时间")]
+        [Description("开始时间")]
         public DateTime StartTime { get; set; }
 
         /// <summary>
         /// 考试结束时间
         /// </summary>
         [SugarColumn(ColumnDescription = "考试结束时间")]
-        [Description("考试结束时间")]
+        [Description("结束时间")]
         public DateTime? EndTime { get; set; }
     }
 }

src/Hotline/Exams/ExamManages/OfflineExamAnalysisExcel.cs

@@ -32,13 +32,13 @@ namespace Hotline.Exams.ExamManages
         /// <summary>
         /// 考试开始时间
         /// </summary>
-        [ExcelColumnName("考试开始时间")]
+        [ExcelColumnName("开始时间")]
         public DateTime StartTime { get; set; }
 
         /// <summary>
         /// 考试结束时间
         /// </summary>
-        [ExcelColumnName("考试结束时间")]
+        [ExcelColumnName("结束时间")]
         public DateTime? EndTime { get; set; }
 
         /// <summary>