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/IRBACServer.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.IBLL/ISysServer/IRBACServer.cs b/Wms/WMS.IBLL/ISysServer/IRBACServer.cs
index 4824bb1..65faec6 100644
--- a/Wms/WMS.IBLL/ISysServer/IRBACServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IRBACServer.cs
@@ -24,20 +24,20 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- List<RoleRightDto> GetRoleRightList(int id);
+ Task<List<RoleRightDto>> GetRoleRightList(int id);
/// <summary>
/// 鏍规嵁瑙掕壊Id鑾峰彇瀵瑰簲鐨勮彍鍗曢�変腑
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- object GetMenuByroleIdNew(int id);
+ Task<List<FunctionMenuDto>> GetMenuByroleIdNew(int id);
/// <summary>
/// 鍒嗛厤鏉冮檺鏄剧ず
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- List<FunctionMenuDto> GetRoleRightRBAC(string MenuNo,string UserId);
+ Task<List<FunctionMenuDto>> GetRoleRightRBAC(string MenuNo,string UserId);
}
}
--
Gitblit v1.8.0