From 62b3bf8205277b9bdceaa83f0d7e5d73312e1780 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 23 八月 2024 14:48:02 +0800
Subject: [PATCH] 解决冲突
---
Wms/WMS.IBLL/ISysServer/IMenuServer.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Wms/WMS.IBLL/ISysServer/IMenuServer.cs b/Wms/WMS.IBLL/ISysServer/IMenuServer.cs
index 2e055c4..6374840 100644
--- a/Wms/WMS.IBLL/ISysServer/IMenuServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IMenuServer.cs
@@ -18,7 +18,7 @@
/// </summary>
/// <param name="menuDto">鑿滃崟Dto</param>
/// <returns></returns>
- List<FunctionMenuVm> GetMenuList(string MenuName, string pMenuNo, string MenuNo, string level);
+ Task<List<FunctionMenuVm>> GetMenuList(string MenuName, string pMenuNo, string MenuNo, string level);
/// <summary>
/// 鏍规嵁灞傜骇鑾峰彇鑿滃崟鍒楄〃
--
Gitblit v1.8.0