去掉冲突依赖与配置

blade-service/blade-sales-part/pom.xml

@@ -96,6 +96,10 @@
                     <groupId>com.github.jsqlparser</groupId>
                     <artifactId>jsqlparser</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/config/PageHelperConfig.java

@@ -1,8 +1,6 @@
 package org.springblade.salesPart.config;
 
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+
 import com.github.pagehelper.PageInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -19,17 +17,6 @@ public class PageHelperConfig {
 
 
 	/**
-	 * MybatisPlus分页插件
-	 */
-	@Bean
-	public MybatisPlusInterceptor mybatisPlusInterceptor() {
-		MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor();
-		mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
-		return mybatisPlusInterceptor;
-	}
-
-
-	/**
 	 * PageHelper分页插件
 	 */
 	@Bean