From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/mapper/RoleMenuMapper.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/mapper/RoleMenuMapper.java b/src/main/java/com/moral/mapper/RoleMenuMapper.java
index 1d6834f..5cca504 100644
--- a/src/main/java/com/moral/mapper/RoleMenuMapper.java
+++ b/src/main/java/com/moral/mapper/RoleMenuMapper.java
@@ -2,17 +2,15 @@
import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.RoleMenu;
-import tk.mybatis.mapper.entity.Example;
-
public interface RoleMenuMapper extends BaseMapper<RoleMenu> {
- List<RoleMenu> getRoleMenuList(Example example);
+ List<Integer> getChannels(@Param("roleId") Integer roleId);
- int deleteByPrimaryKeyOwn(Integer id);
-
- int updateByPrimaryKey(RoleMenu roleMenu);
+ List<Integer> getMenus(@Param("roleId") Integer roleId);
}
--
Gitblit v1.8.0