解决冲突

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -6643,10 +6643,7 @@
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\Form.js" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndentDetail\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndentDetail\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormDetail.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\TextBookIndentDetail\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElectivePre\" />