Merge branch 'develop' of http://192.168.18.110:8880/zry/performance into develop

performance/Performance.Api/Performance.Api.csproj

@@ -29,7 +29,11 @@
   <ItemGroup>
     <None Remove="Template\~%24医院绩效模板.xlsx" />
   </ItemGroup>
-
+  
+  <PropertyGroup>
+    <PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>
+  </PropertyGroup>
+  
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="8.0.0" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="6.0.0" />

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -739,13 +739,7 @@
             二次绩效
             </summary>
         </member>
-        <member name="M:Performance.Api.Controllers.SecondAllotController.List(Performance.DtoModels.SetDepartmentRequest)">
-            <summary>
-            二次绩效列表（没有需要初始化）
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:Performance.Api.Controllers.SecondAllotController.AuditList(Performance.DtoModels.AllotRequest)">
+        <member name="M:Performance.Api.Controllers.SecondAllotController.List">
             <summary>
             二次绩效列表（没有需要初始化）
             </summary>
@@ -769,7 +763,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.SecondAllotController.Temp(System.Int32)">
+        <member name="M:Performance.Api.Controllers.SecondAllotController.Temp(Performance.DtoModels.AllotDeptRequest)">
             <summary>
             选择二次绩效模板
             </summary>
@@ -818,7 +812,7 @@
             <param name="secondid">二次绩效Id</param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.SecondAllotController.AuditList">
+        <member name="M:Performance.Api.Controllers.SecondAllotController.AuditList(Performance.DtoModels.AllotDeptRequest)">
             <summary>
             二次绩效审核列表
             </summary>