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/common/mapper/BaseMapper.java | 29 +++--------------------------
1 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/moral/common/mapper/BaseMapper.java b/src/main/java/com/moral/common/mapper/BaseMapper.java
index 20a1454..139da85 100644
--- a/src/main/java/com/moral/common/mapper/BaseMapper.java
+++ b/src/main/java/com/moral/common/mapper/BaseMapper.java
@@ -1,31 +1,8 @@
package com.moral.common.mapper;
-import java.io.Serializable;
-import java.util.List;
+import tk.mybatis.mapper.common.Mapper;
+import tk.mybatis.mapper.common.MySqlMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.dao.DataAccessException;
+public interface BaseMapper<T> extends Mapper<T>,MySqlMapper<T> {
-public interface BaseMapper<Entity, Example, PK extends Serializable> extends Serializable {
- int insert(Entity record) throws DataAccessException;
-
- int insertSelective(Entity record) throws DataAccessException;
-
- int deleteByPrimaryKey(PK PK) throws DataAccessException;
-
- int deleteByExample(Example example) throws DataAccessException;
-
- int updateByPrimaryKeySelective(Entity record) throws DataAccessException;
-
- int updateByPrimaryKey(Entity record) throws DataAccessException;
-
- int updateByExampleSelective(@Param("record") Entity record, @Param("example") Example example)throws DataAccessException;
-
- int updateByExample(@Param("record") Entity record, @Param("example") Example example) throws DataAccessException;
-
- int countByExample(Example example) throws DataAccessException;
-
- Entity selectByPrimaryKey(PK pk) throws DataAccessException;
-
- List<Entity> selectByExample(Example example) throws DataAccessException;
}
--
Gitblit v1.8.0