Merge remote-tracking branch 'origin/master'

master/pom.xml

@@ -42,6 +42,7 @@
 		<mybatisplus.version>3.3.1</mybatisplus.version>
 		<jxls.version>2.4.2</jxls.version>
 		<jxls-poi.version>1.1.0</jxls-poi.version>
+		<log4j2.version>2.16.0</log4j2.version>
 	</properties>
 
 	<dependencies>
@@ -384,7 +385,18 @@
 			<artifactId>pinyin4j</artifactId>
 			<version>2.5.1</version>
 		</dependency>
+		<!-- log4j日志组件 -->
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>${log4j2.version}</version>
+		</dependency>
 
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-to-slf4j</artifactId>
+			<version>${log4j2.version}</version>
+		</dependency>
 	</dependencies>
 
 	<build>