From a8ccc992964272f6a74631e8c164e8c91e5cb6d4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 16:47:29 +0800
Subject: [PATCH] 处理冲突

---
 BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpPart.cs |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpPart.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpPart.cs
index cb961f5..70a9e95 100644
--- a/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpPart.cs
+++ b/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpPart.cs
@@ -243,17 +243,16 @@
 
         public async Task<bool> DeleteEx(long ID)
         {
-            /*          return await Task.Factory.StartNew(() =>
-                      {
-                          var bol = _service.DeleteExByID(ID);
-                          if (!bol)
-                          {
-                              throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D999, "鍒犻櫎澶辫触");
-                          }
-                          return true;
-                      });*/
-            return false;
-        }
+            return await Task.Factory.StartNew(() =>
+            {
+                var bol = _service.DeleteExByID(ID);
+                if (!bol)
+                {
+                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D999, "鍒犻櫎澶辫触");
+                }
+                return true;
+            });
+         }
 
         /// <summary>
         /// 閫氳繃 Ids 鍒犻櫎

--
Gitblit v1.9.3