From da84e4e72c9d9cc7e2bd40dc4bb7b3222ca3519a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 28 四月 2026 17:07:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Properties/PublishProfiles/WTTFolder.pubxml | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml b/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml
index 8316d46..556b30c 100644
--- a/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml
+++ b/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml
@@ -1,13 +1,9 @@
-<<<<<<< HEAD:WebAPI/Properties/PublishProfiles/WTTFolder.pubxml
-锘�<?xml version="1.0" encoding="utf-8"?>
-=======
<?xml version="1.0" encoding="utf-8"?>
->>>>>>> 6367b170a3db4df6e43a8962b2f17b06a020b913:WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
+ <PropertyGroup>
<DeleteExistingFiles>True</DeleteExistingFiles>
<ExcludeApp_Data>False</ExcludeApp_Data>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
--
Gitblit v1.9.1