From 2b72ee5736445aab3aa2b4ba6b862d7c660be9ce Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期二, 13 五月 2025 09:56:48 +0800
Subject: [PATCH] Merge branch 'dev_mp' into dev
---
pom.xml | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index d8dacaf..ec5f3c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
<poi.version>4.1.2</poi.version>
<springdoc.version>2.6.0</springdoc.version>
<transmittable-thread-local.version>2.14.4</transmittable-thread-local.version>
+ <mybatis-plus-version>3.5.1</mybatis-plus-version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -92,12 +93,6 @@
<groupId>org.mybatis</groupId>
</exclusion>
</exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis-spring</artifactId>
- <version>${mybatis-spring.version}</version>
</dependency>
<!-- io甯哥敤宸ュ叿绫� -->
@@ -212,6 +207,34 @@
<version>${aps.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis-spring</artifactId>
+ <version>${mybatis-spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+ <version>3.5.10</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>mybatis-spring</artifactId>
+ <groupId>org.mybatis</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-jsqlparser</artifactId>
+ <version>3.5.10</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>mybatis-spring</artifactId>
+ <groupId>org.mybatis</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
--
Gitblit v1.9.3