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/AccountRoleMapper.java | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/mapper/AccountRoleMapper.java b/src/main/java/com/moral/mapper/AccountRoleMapper.java
index 550945b..8e089be 100644
--- a/src/main/java/com/moral/mapper/AccountRoleMapper.java
+++ b/src/main/java/com/moral/mapper/AccountRoleMapper.java
@@ -1,18 +1,8 @@
package com.moral.mapper;
-import java.util.List;
-
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.AccountRole;
-import tk.mybatis.mapper.entity.Example;
-
-
public interface AccountRoleMapper extends BaseMapper<AccountRole> {
- List<AccountRole> getAccountRoleList(Example example);
-
- int updateByPrimaryKey(AccountRole accountRole);
-
- int deleteByPrimaryKeyOwn(Integer id);
}
--
Gitblit v1.8.0