From ce4d3fa3964e0736e147c7e6ebf72001d3e5550a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 19 一月 2026 14:06:16 +0800
Subject: [PATCH] 添加意见上传接口

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

diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml b/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml
similarity index 60%
rename from WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
rename to WebAPI/Properties/PublishProfiles/WTTFolder.pubxml
index b079bd3..807d98f 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
+++ b/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml
@@ -1,11 +1,3 @@
-<<<<<<< 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. 
@@ -21,5 +13,4 @@
     <PublishUrl>D:\缃戠珯鍙戝竷\API</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
   </PropertyGroup>
->>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
 </Project>
\ No newline at end of file

--
Gitblit v1.9.1