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 |   37 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 36 insertions(+), 1 deletions(-)

diff --git a/pom.xml b/pom.xml
index 66d0d15..ba62efd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,13 +13,42 @@
     <artifactId>hx-common</artifactId>
     <packaging>jar</packaging>
 
-
     <dependencies>
+
+        <!--瀵硅薄涓嶺ML澶勭悊-->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <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>
+            <groupId>com.qcloud</groupId>
+            <artifactId>cos_api</artifactId>
+        </dependency>
 
         <!--鍙戦�侀偖浠�-->
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-csv</artifactId>
+            <version>1.6</version>
         </dependency>
 
         <dependency>
@@ -238,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