From c53c1ae11cf5739d443a71dc8f07999dfe724f5e Mon Sep 17 00:00:00 2001
From: D <3066417822@qq.com>
Date: Tue, 9 Jan 2024 09:58:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A0=E4=B8=BAspringboot3.2.x=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E5=8F=82=E6=95=B0=E8=A7=A3=E6=9E=90=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96=E8=B7=AF=E5=BE=84=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=90=8D=EF=BC=8C=E6=89=80=E4=BB=A5=E6=9A=82=E6=97=B6?=
 =?UTF-8?q?=E5=9B=9E=E9=80=80=E5=88=B03.1.x=E7=9A=84=E6=9C=80=E9=AB=98?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml              | 27 ++++++++++++++++++++++++---
 ruoyi-common/pom.xml |  2 --
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6fd7e9c..2f3d0c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.ruoyi</groupId>
@@ -31,6 +32,8 @@
         <jwt.version>0.9.1</jwt.version>
         <knife4j.version>4.3.0</knife4j.version>
         <mybatis-spring-boot.version>3.0.3</mybatis-spring-boot.version>
+        <mybatis.version>3.5.15</mybatis.version>
+        <mybatis-plus-boot-starter.version>3.5.5</mybatis-plus-boot-starter.version>
     </properties>
 
 
@@ -41,7 +44,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.2.0</version>
+                <version>3.1.7</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -52,6 +55,24 @@
                 <version>${mybatis-spring-boot.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.mybatis</groupId>
+                <artifactId>mybatis</artifactId>
+                <version>${mybatis.version}</version>
+            </dependency>
+            <!-- mybatis-plus 增强CRUD -->
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.mybatis</groupId>
+                        <artifactId>mybatis-spring</artifactId>
+                    </exclusion>
+                </exclusions>
+                <version>${mybatis-plus-boot-starter.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
@@ -227,7 +248,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.11.0</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 29aa440..820067e 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -134,13 +134,11 @@
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
-            <version>3.5.13</version>
         </dependency>
         <!-- mybatis-plus 增强CRUD -->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.3.1</version>
         </dependency>
 
         <dependency>