From 9cd5e8d656cb727fb4dd21243701ca6921ca29ad Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 23 May 2019 17:49:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2swagger2.9.2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=8A=A5=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml             | 10 ++++++++++
 ruoyi-admin/pom.xml | 15 ++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2f06277d..241d9000 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,6 +114,16 @@
 				<groupId>io.springfox</groupId>
 				<artifactId>springfox-swagger2</artifactId>
 				<version>${swagger.version}</version>
+				<exclusions>
+				    <exclusion>
+				        <groupId>io.swagger</groupId>
+				        <artifactId>swagger-annotations</artifactId>
+				    </exclusion>
+				    <exclusion>
+				        <groupId>io.swagger</groupId>
+				        <artifactId>swagger-models</artifactId>
+				    </exclusion>
+				</exclusions>
 			</dependency>
 			
 			<!-- swagger2-UI-->
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 0c0014e9..bf838a6b 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2</version>
+        <version>3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
@@ -36,6 +36,19 @@
 			<artifactId>springfox-swagger2</artifactId>
 		</dependency>
 		
+		<!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+		
 		<!-- swagger2-UI-->
 		<dependency>
 			<groupId>io.springfox</groupId>