From 69c08cb7e3174cdbffa1530b9811ac1f93b7ccc9 Mon Sep 17 00:00:00 2001
From: youjianchi <13260889671@163.com>
Date: Tue, 13 Feb 2024 09:20:02 +0800
Subject: [PATCH] =?UTF-8?q?[fix]:=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/pom.xml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 441beb7f..d5808eec 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -45,18 +45,18 @@
             <version>1.5.21</version>
         </dependency>
 
+        <dependency>
+           <groupId>io.swagger</groupId>
+           <artifactId>swagger-models</artifactId>
+           <version>1.5.21</version>
+       </dependency>
+
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
             <version>5.7.16</version>
         </dependency>
 
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.5.21</version>
-        </dependency>
-
         <!-- swagger2-UI-->
         <dependency>
             <groupId>io.springfox</groupId>
@@ -98,6 +98,12 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-activiti</artifactId>
             <version>4.6.1</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>swagger-annotations</artifactId>
+                    <groupId>io.swagger</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -109,12 +115,7 @@
             <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>1.5.10</version>
-            <scope>compile</scope>
-        </dependency>
+
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-core</artifactId>