Merge remote-tracking branch 'origin/master'

This commit is contained in:
huangdeliang
2020-11-24 21:59:20 +08:00
5 changed files with 19 additions and 18 deletions

View File

@ -7,7 +7,7 @@
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<packaging>jar</packaging>
<artifactId>ruoyi-admin</artifactId>
<description>
@ -102,23 +102,6 @@
<scope>compile</scope>
</dependency>
<!-- 多模块排除内置tomcat -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>