From af78744eacb1e41ef2ba7a2e36cde3f915100ba2 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 09 四月 2026 13:14:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index ff83e40..93b72a3 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -94,6 +94,7 @@
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
<publishTime>04/06/2023 15:57:02</publishTime>
+>>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -253,6 +254,7 @@
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
<publishTime>04/06/2023 15:57:02</publishTime>
+>>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -376,6 +378,7 @@
</File>
<File Include="Index.html">
<publishTime>04/06/2023 15:57:02</publishTime>
+>>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
--
Gitblit v1.9.1