From 0f1a8431d6c8fbb4532818f95431a6b0f9b54a39 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期六, 26 十月 2024 18:54:24 +0800
Subject: [PATCH] 合并更新
---
Tiger.Business.MES/Task/Jobs.U9C_ME_GetWo.cs | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/Tiger.Business.MES/Task/Jobs.U9C_ME_GetWo.cs b/Tiger.Business.MES/Task/Jobs.U9C_ME_GetWo.cs
index 6d19b83..0e538c0 100644
--- a/Tiger.Business.MES/Task/Jobs.U9C_ME_GetWo.cs
+++ b/Tiger.Business.MES/Task/Jobs.U9C_ME_GetWo.cs
@@ -58,8 +58,6 @@
await Task.CompletedTask;
}
}
-<<<<<<< Updated upstream
-=======
/// <summary>
/// 浠嶶9C鑾峰彇宸ュ崟淇℃伅 FluentScheduler鐗�
@@ -158,5 +156,4 @@
}
}
}
->>>>>>> Stashed changes
}
--
Gitblit v1.9.3