Merge remote-tracking branch 'origin/dm_dev' into dm_dev

jz-dm-apigateway/src/main/java/com/jz/dm/config/MybatisPlusConfig.java

 package com.jz.dm.config;
 
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -19,7 +18,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @MapperScan("com.jz.dm.mapper")
 public class MybatisPlusConfig {
 
-   /* @Bean
+    @Bean
     public PaginationInterceptor paginationInterceptor() {
         PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
         // 设置请求的页面大于最大页后操作， true调回到首页，false 继续请求  默认false
@@ -30,11 +29,11 @@ public class MybatisPlusConfig {
         paginationInterceptor.setCountSqlParser(new JsqlParserCountOptimize(true));
 
         return paginationInterceptor;
-    }*/
-    @Bean
-    public MybatisPlusInterceptor mybatisPlusInterceptor() {
-        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
-        return interceptor;
     }
+    //@Bean
+    //public MybatisPlusInterceptor mybatisPlusInterceptor() {
+    //    MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+    //    interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.H2));
+    //    return interceptor;
+    //}
 }