修改泛型名称

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/SqlHelper.java

@@ -277,15 +277,15 @@ public final class SqlHelper {
      *
      * @param entityClass 实体
      * @param <T>         实体类型
-     * @param <Mapper>    Mapper类型
+     * @param <M>         Mapper类型
      * @return Mapper
      */
     @SuppressWarnings("unchecked")
-    public static <T,Mapper extends BaseMapper<T>> Mapper getMapper(Class<T> entityClass, SqlSession sqlSession) {
+    public static <T,M extends BaseMapper<T>> M getMapper(Class<T> entityClass, SqlSession sqlSession) {
         Assert.notNull(entityClass, "entityClass can't be null!");
         TableInfo tableInfo = Optional.ofNullable(TableInfoHelper.getTableInfo(entityClass)).orElseThrow(() -> ExceptionUtils.mpe("Can not find TableInfo from Class: \"%s\".", entityClass.getName()));
         Class<?> mapperClass = ClassUtils.toClassConfident(tableInfo.getCurrentNamespace());
-        return (Mapper) tableInfo.getConfiguration().getMapper(mapperClass, sqlSession);
+        return (M) tableInfo.getConfiguration().getMapper(mapperClass, sqlSession);
     }
 
     /**
@@ -295,9 +295,10 @@ public final class SqlHelper {
      * @param sFunction   lambda操作，例如 {@code m->m.selectList(wrapper)}
      * @param <T>         实体类的类型
      * @param <R>         返回值类型
+     * @param <M>         Mapper类型
      * @return 返回lambda执行结果
      */
-    public static <T, R,Mapper extends BaseMapper<T>> R execute(Class<T> entityClass, SFunction<Mapper, R> sFunction) {
+    public static <T, R,M extends BaseMapper<T>> R execute(Class<T> entityClass, SFunction<M, R> sFunction) {
         SqlSession sqlSession = SqlHelper.sqlSession(entityClass);
         try {
             return sFunction.apply(SqlHelper.getMapper(entityClass, sqlSession));