From c9293cc2bdff831b3bf7c0ae75c50fd2a97f5815 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 02 六月 2024 19:29:48 +0800
Subject: [PATCH] Excel注解新增属性comboReadDict

---
 pom.xml |   45 +++++++++++----------------------------------
 1 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/pom.xml b/pom.xml
index 56426cc..6744b26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>3.8.2</version>
+    <version>3.8.7</version>
     <packaging>jar</packaging>
 
     <name>ruoyi</name>
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.14</version>
+        <version>2.5.15</version>
         <relativePath />
     </parent>
 
@@ -24,19 +24,17 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-        <mybatis.spring.boot.starter.version>2.2.2</mybatis.spring.boot.starter.version>
-        <pagehelper.spring.boot.starter.version>1.4.1</pagehelper.spring.boot.starter.version>
-        <fastjson.version>2.0.8</fastjson.version>
-        <druid.version>1.2.11</druid.version>
-        <commons.io.version>2.11.0</commons.io.version>
-        <commons.fileupload.version>1.4</commons.fileupload.version>
-        <commons.collections.version>3.2.2</commons.collections.version>
+        <spring-framework.version>5.3.33</spring-framework.version>
+        <pagehelper.spring.boot.starter.version>1.4.7</pagehelper.spring.boot.starter.version>
+        <fastjson.version>2.0.43</fastjson.version>
+        <druid.version>1.2.20</druid.version>
+        <commons.io.version>2.13.0</commons.io.version>
         <bitwalker.version>1.21</bitwalker.version>
         <jwt.version>0.9.1</jwt.version>
-        <kaptcha.version>2.3.2</kaptcha.version>
+        <kaptcha.version>2.3.3</kaptcha.version>
         <swagger.version>3.0.0</swagger.version>
         <poi.version>4.1.2</poi.version>
-        <oshi.version>6.1.6</oshi.version>
+        <oshi.version>6.5.0</oshi.version>
         <velocity.version>2.3</velocity.version>
     </properties>
 
@@ -99,13 +97,6 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- SpringBoot闆嗘垚mybatis妗嗘灦 -->
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>${mybatis.spring.boot.starter.version}</version>
-        </dependency>
-
         <!-- pagehelper 鍒嗛〉鎻掍欢 -->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
@@ -137,13 +128,6 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>${commons.io.version}</version>
-        </dependency>
-
-        <!-- 鏂囦欢涓婁紶宸ュ叿绫� -->
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>${commons.fileupload.version}</version>
         </dependency>
 
         <!-- 瑙f瀽瀹㈡埛绔搷浣滅郴缁熴�佹祻瑙堝櫒绛� -->
@@ -220,13 +204,6 @@
             <version>${velocity.version}</version>
         </dependency>
 
-        <!-- collections宸ュ叿绫� -->
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>${commons.collections.version}</version>
-        </dependency>
-
         <!-- 瀹氭椂浠诲姟 -->
         <dependency>
             <groupId>org.quartz-scheduler</groupId>
@@ -241,12 +218,12 @@
 
         <!-- 楠岃瘉鐮� -->
         <dependency>
-            <groupId>com.github.penggle</groupId>
+            <groupId>pro.fessional</groupId>
             <artifactId>kaptcha</artifactId>
             <version>${kaptcha.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>javax.servlet-api</artifactId>
+                    <artifactId>servlet-api</artifactId>
                     <groupId>javax.servlet</groupId>
                 </exclusion>
             </exclusions>

--
Gitblit v1.9.3