From 9b3a4c27da3d2da9017a289ed38b27d22f571e91 Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期二, 12 九月 2023 16:43:57 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/swspkmas into zf1

---
 exam-system/pom.xml  |    3 +--
 ruoyi-admin/pom.xml  |   22 +++++++++++-----------
 ruoyi-common/pom.xml |   13 +++++++++++++
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/exam-system/pom.xml b/exam-system/pom.xml
index c9f98e3..0d0d6bf 100644
--- a/exam-system/pom.xml
+++ b/exam-system/pom.xml
@@ -15,10 +15,9 @@
         <java.version>8</java.version>
     </properties>
     <dependencies>
-        <!-- 通用工具-->
         <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common</artifactId>
+            <artifactId>ruoyi-system</artifactId>
         </dependency>
         <!--附件依赖-->
         <dependency>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 82c8ae9..97f4762 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -24,18 +24,18 @@
             <optional>true</optional> <!-- 表示依赖不会传递 -->
         </dependency>
 
-        <!-- swagger3-->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
-        </dependency>
+<!--        &lt;!&ndash; swagger3&ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>io.springfox</groupId>-->
+<!--            <artifactId>springfox-boot-starter</artifactId>-->
+<!--        </dependency>-->
 
-        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.6.2</version>
-        </dependency>
+<!--        &lt;!&ndash; 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>io.swagger</groupId>-->
+<!--            <artifactId>swagger-models</artifactId>-->
+<!--            <version>1.6.2</version>-->
+<!--        </dependency>-->
 
          <!-- Mysql驱动包 -->
         <dependency>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 3726c1a..78b298c 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -23,6 +23,19 @@
             <artifactId>spring-context-support</artifactId>
         </dependency>
 
+        <!-- swagger3-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+
         <!-- SpringWeb模块 -->
         <dependency>
             <groupId>org.springframework</groupId>

--
Gitblit v1.9.2