From f7d9e845fa65d5d95ca22fff220da7a182544fb6 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 01 四月 2026 15:42:39 +0800
Subject: [PATCH] 1
---
WebAPI/WebAPI.csproj.user | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 1fad058..7c0ddcd 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -14,7 +14,11 @@
<NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile8.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
+<<<<<<< HEAD
<NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
+=======
+ <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
+>>>>>>> d98a91773d27bbb115c1b979cfbafdac1123cb82
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
--
Gitblit v1.9.1