Merge remote-tracking branch 'origin/master'

hzims-service/safeproduct/pom.xml

@@ -36,6 +36,12 @@
         <dependency>
             <groupId>com.hnac.hzims</groupId>
             <artifactId>hzims-operational-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>poi-ooxml-schemas</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.hnac.hzims</groupId>
@@ -64,6 +70,11 @@
             <artifactId>blade-starter-excel</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>ooxml-schemas</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-test</artifactId>
             <scope>test</scope>