页面修改

EduSpider.Model/Extend/RB_Exam_Score_Extend.cs

@@ -10,14 +10,13 @@ namespace EduSpider.Model.Extend
     /// </summary>
     public class RB_Exam_Score_Extend : RB_Exam_Score
     {
-<<<<<<< HEAD
+
         /// <summary>
         /// 考试名称
         /// </summary>
         public string ExamName { get; set; }
-=======
+
         public List<ExamQScoreModel> ScoreList { get; set; }
->>>>>>> 6d0347e0f3f9e8ee506c9ab8673669368baa27d7
 
         /// <summary>
         /// 考试导入时间
@@ -28,7 +27,8 @@ namespace EduSpider.Model.Extend
     /// <summary>
     /// 学生单项分数
     /// </summary>
-	public class ExamQScoreModel { 
+    public class ExamQScoreModel
+    {
         /// <summary>
         /// 题号
         /// </summary>