From f03adbc465c221bdd0f683f995b42a58d7d8d805 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期一, 01 十二月 2025 15:02:41 +0800
Subject: [PATCH] 1

---
 WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml
index dc87e92..4902e25 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml
@@ -4,13 +4,23 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+<<<<<<< HEAD
     <DeleteExistingFiles>False</DeleteExistingFiles>
     <ExcludeApp_Data>False</ExcludeApp_Data>
     <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>D:\缃戠珯鍙戝竷\API</PublishUrl>
+    <PublishUrl>D:\gz\缃戠珯鍙戝竷\MES-WEB-API</PublishUrl>
+=======
+    <DeleteExistingFiles>True</DeleteExistingFiles>
+    <ExcludeApp_Data>True</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
+>>>>>>> 859d5fb0665d48215793ecd8b07b114a3e66b7f1
     <WebPublishMethod>FileSystem</WebPublishMethod>
   </PropertyGroup>
 </Project>
\ No newline at end of file

--
Gitblit v1.9.1