From 0c782d16085df77f76c8b12cfedbcdcb4502b613 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 01 十一月 2024 17:45:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 1 -
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 12 ++++++------
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
6 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index acad705..a4d2d5a 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -2338,7 +2338,6 @@
objJsonResult = (json)AuditGy_Routing_Flow(idArray[i], IsAudit, CurUserName, CurUserID);//瀹℃牳鎵ц
if (objJsonResult.count == 0)
{
- oCN.RollBack();
objJsonResult.Message += "绗�" + (i + 1) + "琛屽嚭鐜伴棶棰樻棤娉曠户缁畬鎴�";
return objJsonResult;
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index 3b4453d..e92461a 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -45,10 +45,10 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>10/31/2024 10:55:13</publishTime>
+ <publishTime>10/31/2024 16:04:37</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>10/31/2024 10:55:13</publishTime>
+ <publishTime>10/31/2024 16:04:37</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>10/31/2024 10:51:26</publishTime>
+ <publishTime>10/31/2024 16:01:26</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>10/31/2024 10:51:26</publishTime>
+ <publishTime>10/31/2024 16:01:26</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>10/31/2024 10:55:50</publishTime>
+ <publishTime>10/31/2024 16:05:15</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>10/31/2024 10:55:50</publishTime>
+ <publishTime>10/31/2024 16:05:15</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 07bedb2..5416435 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index ad05617..2990a67 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 07bedb2..5416435 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index ad05617..2990a67 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1