From 7ffbf3f7c27b0dff2bd33c5b7284da71f47d734e Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 16 八月 2024 17:20:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
index e1e4283..8ed92de 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,7 +10,11 @@
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>x86</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
- <PublishUrl>D:\缃戠珯鍙戝竷\API</PublishUrl>
+<<<<<<< HEAD
+ <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\API</PublishUrl>
+=======
+ <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
+>>>>>>> 33ffe895b1862cda181a7fbb5028f81620226087
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
</PropertyGroup>
--
Gitblit v1.9.1