Merge branch 'hwh' into Liudl

bklLiudl

2024-07-10 6d5c3dee0d97798f70bf965e48c3a782b3df9e7d

 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);
    }
}