From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_MenuService.cs | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_MenuService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_MenuService.cs
index b054aa3..64d8daa 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_MenuService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_MenuService.cs
@@ -14,6 +14,8 @@
{
object GetCurrentMenuActionList();
+ object GetCurrentMenuPhoneActionList();
+
List<MenuDTO> GetUserMenuList(int roleId);
List<ActionDTO> GetActions(int menuId, List<ActionDTO> menuActions, List<Permissions> permissions, int roleId);
--
Gitblit v1.9.3