Merge remote-tracking branch 'origin/master'

pom.xml

@@ -58,7 +58,7 @@
     <dependencies>
     <dependencies>
         <dependency> <!-- 引入log4j2依赖 -->
         <dependency> <!-- 引入log4j2依赖 -->
             <groupId>org.springframework.boot</groupId>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
+            <artifactId>spring-boot-starter-slf4j</artifactId>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <groupId>org.springframework.boot</groupId>