From 4edeec22721fe79ec3021252589f6c28a533136d Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 10 六月 2025 13:44:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
index f063768..b728def 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
@@ -4,21 +4,18 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
-<<<<<<< HEAD
- <DeleteExistingFiles>False</DeleteExistingFiles>
-=======
+
+ <!-- <DeleteExistingFiles>False</DeleteExistingFiles> -->
<DeleteExistingFiles>True</DeleteExistingFiles>
->>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
+
<ExcludeApp_Data>False</ExcludeApp_Data>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
-<<<<<<< HEAD
+
<PublishUrl>D:\缃戠珯鍙戝竷\API</PublishUrl>
-=======
- <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\API</PublishUrl>
->>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
+ <!-- <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\API</PublishUrl> -->
<WebPublishMethod>FileSystem</WebPublishMethod>
</PropertyGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1