解决冲突

TEAMModelOS.Service/Evaluation/Implements/HtmlAnalyzeService.cs

@@ -7,6 +7,7 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using TEAMModelOS.Model.Core.Dtos;
 using TEAMModelOS.Model.Evaluation.Dtos;
+using TEAMModelOS.Model.Evaluation.Dtos.Own;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.Helper.Common.StringHelper;
 using TEAMModelOS.SDK.Helper.Security.ShaHash;

TEAMModelOS.Service/Evaluation/Interfaces/IHtmlAnalyzeService.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using TEAMModelOS.Model.Evaluation.Dtos;
+using TEAMModelOS.Model.Evaluation.Dtos.Own;
 using TEAMModelOS.Service.Core.Interfaces;
 
 namespace TEAMModelOS.Service.Evaluation.Interfaces

TEAMModelOS.Service/Evaluation/Interfaces/IImportExerciseService.cs

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using TEAMModelOS.Model.Core.Models;
 using TEAMModelOS.Model.Evaluation.Dtos;
+using TEAMModelOS.Model.Evaluation.Dtos.Own;
 using TEAMModelOS.Service.Core.Interfaces;
 
 namespace TEAMModelOS.Service.Evaluation.Interfaces

TEAMModelOS/Controllers/Evaluation/ImportExerciseController.cs

@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using TEAMModelOS.Controllers.Core;
 using TEAMModelOS.Model.Core.Models;
 using TEAMModelOS.Model.Evaluation.Dtos;
+using TEAMModelOS.Model.Evaluation.Dtos.Own;
 using TEAMModelOS.SDK.Context.Constant.Common;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;

TeamModelOS.Test.JsonPath/TeamModelOS.Test.JsonPath.csproj

@@ -7,7 +7,6 @@
 
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack" Version="1.11.4" />
-    <PackageReference Include="Open-Xml-PowerTools" Version="4.4.0" />
   </ItemGroup>
 
   <ItemGroup>