From 9cc914b45ab59b2b77ca420922242d43e136d6ff Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 13 四月 2021 11:45:07 +0800
Subject: [PATCH] 1.屏蔽冲突依赖

---
 pom.xml |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7601292..ba62efd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,17 @@
             <artifactId>jaxb-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.9</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>dom4j</artifactId>
+                    <groupId>dom4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
         <!--鑵捐浜� cos-->
         <dependency>
@@ -256,6 +267,12 @@
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.dtflys.forest</groupId>
+            <artifactId>spring-boot-starter-forest</artifactId>
+            <version>1.5.0-RC2</version>
+        </dependency>
     </dependencies>
 
     <build>

--
Gitblit v1.8.0