Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Model/ViewModel/Question/RB_Question_Type_ViewModel.cs

@@ -58,4 +58,19 @@ namespace Edu.Model.ViewModel.Question
         public string Content { get; set; }
     }
 
+    /// <summary>
+    /// 连线题
+    /// </summary>
+    public class matchingItem
+    {
+        /// <summary>
+        /// 选项编号【例如:A,B,C,D,1,2,3,4】
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 选项内容
+        /// </summary>
+        public string Content { get; set; }
+    }
 }
\ No newline at end of file

Edu.Module.Question/AnalysisQuestionTypeModule.cs

@@ -57,6 +57,14 @@ namespace Edu.Module.Question
                 case "entry-problem":
                     obj = Common.Plugin.JsonHelper.DeserializeObject<List<fillInItem>>(data);
                     break;
+                //资料题
+                case "data-question":
+                    obj = Common.Plugin.JsonHelper.DeserializeObject<List<fillInItem>>(data);
+                    break;
+                //连线题
+                case "matching":
+                    obj = Common.Plugin.JsonHelper.DeserializeObject<List<List<matchingItem>>>(data);
+                    break;
             }
             return obj;
         }