Merge branch 'develop' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS.Model/Evaluation/Dtos/Own/ItemBankDto.cs

@@ -21,6 +21,10 @@ namespace TEAMModelOS.Model.Evaluation.Dtos.Own
         public string Question { get; set; }
         public List<CodeValue> Option { get; set; }
         public List<string> Answer { get; set; }
+        /// <summary>
+        /// 知识点
+        /// </summary>
+        public List<Dictionary<string, object>> Concept { get; set; }
         public string Explain { get; set; }
         public string Type { get; set; }
         public string ResourceCode { get; set; }

TEAMModelOS.Service/Evaluation/Implements/ItemBankService.cs

@@ -40,6 +40,7 @@ namespace TEAMModelOS.Service.EvaluaTion.Implements
                                 Question = q.Question,
                                 Option = MessagePackHelper.ObjectToJson(q.Option),
                                 Answer = MessagePackHelper.ObjectToJson(q.Answer),
+                                Concept = MessagePackHelper.ObjectToJson(q.Concept),
                                 Explain = q.Explain,
                                 Type = q.Type
                             });
@@ -53,6 +54,7 @@ namespace TEAMModelOS.Service.EvaluaTion.Implements
                                 PartitionKey = lang,
                                 Question = q.Question,
                                 Option = MessagePackHelper.ObjectToJson(q.Option),
+                                Concept = MessagePackHelper.ObjectToJson(q.Concept),
                                 Answer = MessagePackHelper.ObjectToJson(q.Answer),
                                 Explain = q.Explain,
                                 Type = q.Type,
@@ -69,6 +71,7 @@ namespace TEAMModelOS.Service.EvaluaTion.Implements
                         RowKey = p.RowKey,
                         PartitionKey = lang,
                         Question = p.Question,
+                        Concept = MessagePackHelper.ObjectToJson(p.Concept),
                         Option = MessagePackHelper.ObjectToJson(p.Option),
                         Answer = MessagePackHelper.ObjectToJson(p.Answer),
                         Explain = p.Explain,
@@ -81,6 +84,7 @@ namespace TEAMModelOS.Service.EvaluaTion.Implements
                         RowKey = RowKeyP,
                         PartitionKey = lang,
                         Question = p.Question,
+                        Concept = MessagePackHelper.ObjectToJson(p.Concept),
                         Option = MessagePackHelper.ObjectToJson(p.Option),
                         Answer = MessagePackHelper.ObjectToJson(p.Answer),
                         Explain = p.Explain,