From 06087a04354fa9addac411bc2d9744f7238d0401 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期六, 28 二月 2026 11:33:36 +0800
Subject: [PATCH] 1

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

diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml
index f4a477b..42c9d64 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml
@@ -10,7 +10,11 @@
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
+<<<<<<< HEAD
+    <PublishUrl>D:\gz\wy\MES-WEB-API</PublishUrl>
+=======
     <PublishUrl>E:\gz\缃戠珯鍙戝竷\MES-WEB-API</PublishUrl>
+>>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
     <WebPublishMethod>FileSystem</WebPublishMethod>
   </PropertyGroup>
 </Project>
\ No newline at end of file

--
Gitblit v1.9.1