From 2d142a18b9bd53cd399f3610d71e2105779dceea Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期一, 12 一月 2026 15:28:45 +0800
Subject: [PATCH] 1

---
 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
index 9ce3c04..b079bd3 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
@@ -1,7 +1,25 @@
+<<<<<<< HEAD
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 姝ゆ枃浠剁敱 Web 椤圭洰鐨勫彂甯�/鎵撳寘杩囩▼浣跨敤銆傚彲浠ラ�氳繃缂栬緫姝� MSBuild 鏂囦欢
 鑷畾涔夋杩囩▼鐨勮涓恒�備负浜嗚В涓庢鐩稿叧鐨勬洿澶氬唴瀹癸紝璇疯闂� https://go.microsoft.com/fwlink/?LinkID=208121銆� 
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+=======
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>D:\缃戠珯鍙戝竷\API</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+  </PropertyGroup>
+>>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
 </Project>
\ No newline at end of file

--
Gitblit v1.9.1