From 022dd037110c2c4e1b5be1cb87a79e92d84db5e7 Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Wed, 21 Aug 2024 11:49:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3safeProduct=20poi?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hzims-service/safeproduct/pom.xml | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/hzims-service/safeproduct/pom.xml b/hzims-service/safeproduct/pom.xml
index 7c216a1..48bf51d 100644
--- a/hzims-service/safeproduct/pom.xml
+++ b/hzims-service/safeproduct/pom.xml
@@ -37,6 +37,10 @@
                     <artifactId>poi-ooxml-schemas</artifactId>
                     <groupId>org.apache.poi</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>easypoi-base</artifactId>
+                    <groupId>cn.afterturn</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -125,16 +129,28 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>poi</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>3.17</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.apache.poi</groupId>-->
+<!--            <artifactId>poi</artifactId>-->
+<!--            <version>3.17</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
             <version>3.15</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>poi</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
     <build>

From fc5779fc42608637d90ce8ee0a2dfb8462c1fbab Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Wed, 21 Aug 2024 14:39:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=BF=98=E5=8E=9F=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97pom=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hzims-service/safeproduct/pom.xml | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/hzims-service/safeproduct/pom.xml b/hzims-service/safeproduct/pom.xml
index 48bf51d..7c216a1 100644
--- a/hzims-service/safeproduct/pom.xml
+++ b/hzims-service/safeproduct/pom.xml
@@ -37,10 +37,6 @@
                     <artifactId>poi-ooxml-schemas</artifactId>
                     <groupId>org.apache.poi</groupId>
                 </exclusion>
-                <exclusion>
-                    <artifactId>easypoi-base</artifactId>
-                    <groupId>cn.afterturn</groupId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -129,28 +125,16 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>poi</artifactId>
-                    <groupId>org.apache.poi</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.apache.poi</groupId>-->
-<!--            <artifactId>poi</artifactId>-->
-<!--            <version>3.17</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
             <version>3.15</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>poi</artifactId>
-                    <groupId>org.apache.poi</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
     <build>