From da0c86dd546e8f4f8e6083a008920278da90b661 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 01 六月 2022 13:06:42 +0800
Subject: [PATCH] update mybatis-plus 3.5.1 => 3.5.2 解决新版本兼容性问题 关键字冲突修改

---
 ruoyi-common/pom.xml |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index bb476cb..d89f454 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -58,12 +58,6 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
 
-        <!-- excel宸ュ叿 -->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
@@ -73,12 +67,6 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-        </dependency>
-
-        <!-- jdk11 缂哄け渚濊禆 jaxb-->
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
         </dependency>
 
         <!-- servlet鍖� -->
@@ -128,6 +116,11 @@
         </dependency>
 
         <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>jakarta.mail</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>

--
Gitblit v1.9.3