From 1dcc7b63a20daad7c7060f18878d8e8dbaad02de Mon Sep 17 00:00:00 2001 From: qiuyao <qiuyao@hnkhzn.com> Date: 星期一, 28 四月 2025 16:41:31 +0800 Subject: [PATCH] 解决冲突 --- 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj" index f63ee45..4aa8db2 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj" @@ -67,6 +67,7 @@ </ItemGroup> <ItemGroup> + <ProjectReference Include="..\WIDESEAWCS_Common\WIDESEAWCS_Common.csproj" /> <ProjectReference Include="..\WIDESEAWCS_SystemServices\WIDESEAWCS_SystemServices.csproj" /> <ProjectReference Include="..\WIDESEAWCs_TaskInfoService\WIDESEAWCs_TaskInfoService.csproj" /> <ProjectReference Include="..\WIDESEAWCS_Tasks\WIDESEAWCS_Tasks.csproj" /> @@ -84,10 +85,6 @@ <Content Update="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Sys_Tenant.tsv"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> - </ItemGroup> - - <ItemGroup> - <Folder Include="wwwroot\image\" /> </ItemGroup> </Project> -- Gitblit v1.9.3