From db63a35fcc7a49cbb0e5f28f1d2cc355fa19fe13 Mon Sep 17 00:00:00 2001
From: chenhaozhe <gaozhechen26@gmail.com>
Date: 星期日, 12 四月 2026 19:50:27 +0800
Subject: [PATCH] 合并分支

---
 WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
index d569ebd..16bd310 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
@@ -50,6 +50,10 @@
     <File Include="bin/BLL.pdb">
       <publishTime>04/02/2026 18:26:41</publishTime>
     </File>
+    <File Include="bin/BLL.pdb">
+      <publishTime>04/03/2026 09:16:39</publishTime>
+>>>>>>> 71e9e3fb6c75ce7358a209257219f120127b3e7e
+    </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/18/2020 05:32:28</publishTime>
     </File>
@@ -59,6 +63,10 @@
     <File Include="bin/DAL.pdb">
       <publishTime>04/02/2026 18:26:40</publishTime>
     </File>
+    <File Include="bin/DAL.pdb">
+      <publishTime>04/03/2026 09:16:36</publishTime>
+>>>>>>> 71e9e3fb6c75ce7358a209257219f120127b3e7e
+    </File>
     <File Include="bin/Dapper.dll">
       <publishTime>07/22/2016 22:52:40</publishTime>
     </File>

--
Gitblit v1.9.1