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/RoleMapper.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/mapper/RoleMapper.java b/src/main/java/com/moral/mapper/RoleMapper.java
index cc4b732..e99b725 100644
--- a/src/main/java/com/moral/mapper/RoleMapper.java
+++ b/src/main/java/com/moral/mapper/RoleMapper.java
@@ -2,16 +2,13 @@
import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.Role;
+import tk.mybatis.mapper.entity.Example;
+
public interface RoleMapper extends BaseMapper<Role> {
- int insertSelective(Role role);
+ List<Role> getRoleList(Example example);
- int updateByPrimaryKeySelective(Role role);
-
- List<Role> getRoleList(@Param("roleName") String roleName);
}
--
Gitblit v1.8.0