合并冲突后引用丢失

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

@@ -7275,10 +7275,6 @@
       <Project>{36083FBB-CE7F-4EE0-8459-C4B60A2DD070}</Project>
       <Name>Learun.Application.Language</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Mapping\Learun.Application.Mapping.csproj">
-      <Project>{79f8e2f1-08e7-4336-93e0-512b39f9dd54}</Project>
-      <Name>Learun.Application.Mapping</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Message\Learun.Application.Message.csproj">
       <Project>{211fa31a-b9d8-4f48-80cc-573b9410828e}</Project>
       <Name>Learun.Application.Message</Name>

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

@@ -323,10 +323,18 @@
       <Project>{db34dfc9-7227-41fa-88aa-832dbf247811}</Project>
       <Name>Learun.Application.IM</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Mapping\Learun.Application.Mapping.csproj">
+      <Project>{79f8e2f1-08e7-4336-93e0-512b39f9dd54}</Project>
+      <Name>Learun.Application.Mapping</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.OA\Learun.Application.OA.csproj">
       <Project>{5f3fdf79-a47e-4782-a090-dd0dc2d5cdc1}</Project>
       <Name>Learun.Application.OA</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.TwoDevelopment\Learun.Application.TwoDevelopment.csproj">
+      <Project>{56f9a112-fd96-4809-98f4-0d7c5de0711b}</Project>
+      <Name>Learun.Application.TwoDevelopment</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.WorkFlow\Learun.Application.WorkFlow.csproj">
       <Project>{88d8e99d-df26-4506-83c5-51e354818bef}</Project>
       <Name>Learun.Application.WorkFlow</Name>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Learun.Application.Excel.csproj

@@ -108,6 +108,10 @@
       <Project>{0cdd0dc8-74cf-4c71-923c-66204a8923d3}</Project>
       <Name>Learun.Application.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Learun.Application.TwoDevelopment\Learun.Application.TwoDevelopment.csproj">
+      <Project>{56f9a112-fd96-4809-98f4-0d7c5de0711b}</Project>
+      <Name>Learun.Application.TwoDevelopment</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj

@@ -728,6 +728,10 @@
       <Project>{886b15b8-7b60-4872-85d1-7f47ac0951ef}</Project>
       <Name>Learun.Application.Report</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Learun.Application.TwoDevelopment\Learun.Application.TwoDevelopment.csproj">
+      <Project>{56f9a112-fd96-4809-98f4-0d7c5de0711b}</Project>
+      <Name>Learun.Application.TwoDevelopment</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Learun.Application.WorkFlow\Learun.Application.WorkFlow.csproj">
       <Project>{88d8e99d-df26-4506-83c5-51e354818bef}</Project>
       <Name>Learun.Application.WorkFlow</Name>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Message/Learun.Application.Message.csproj

@@ -107,6 +107,10 @@
       <Project>{db34dfc9-7227-41fa-88aa-832dbf247811}</Project>
       <Name>Learun.Application.IM</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Learun.Application.TwoDevelopment\Learun.Application.TwoDevelopment.csproj">
+      <Project>{56f9a112-fd96-4809-98f4-0d7c5de0711b}</Project>
+      <Name>Learun.Application.TwoDevelopment</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Learun.Application.WeChat\Learun.Application.WeChat.csproj">
       <Project>{36fa9414-767e-4806-9e45-2075216b1070}</Project>
       <Name>Learun.Application.WeChat</Name>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj

@@ -250,6 +250,10 @@
       <Project>{5F3FDF79-A47E-4782-A090-DD0DC2D5CDC1}</Project>
       <Name>Learun.Application.OA</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Learun.Application.TwoDevelopment\Learun.Application.TwoDevelopment.csproj">
+      <Project>{56f9a112-fd96-4809-98f4-0d7c5de0711b}</Project>
+      <Name>Learun.Application.TwoDevelopment</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Analyzer Include="..\..\..\packages\Microsoft.DependencyValidation.Analyzers.0.10.0\analyzers\dotnet\cs\Microsoft.DependencyValidation.Analyzers.resources.dll" />

Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.DataSync/Quanjiang.DigitalScholl.DataSync.csproj

@@ -163,6 +163,10 @@
       <Project>{10BAA80B-16F5-4514-902D-F9F7FA608BDD}</Project>
       <Name>Learun.Application.Excel</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.TwoDevelopment\Learun.Application.TwoDevelopment.csproj">
+      <Project>{56f9a112-fd96-4809-98f4-0d7c5de0711b}</Project>
+      <Name>Learun.Application.TwoDevelopment</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.WorkFlow\Learun.Application.WorkFlow.csproj">
       <Project>{88D8E99D-DF26-4506-83C5-51E354818BEF}</Project>
       <Name>Learun.Application.WorkFlow</Name>