Merge branch 'cmg-basefun-hzqmjk' into master-jiayan-test

fwq

2024-08-19 7232dfe75b210e021a61a4b848bf0e9c951abd0d

 pom.xml

@@ -7,7 +7,7 @@
    <parent>
        <groupId>com.hx.gitee</groupId>
        <artifactId>hx-parent</artifactId>
        <version>1.0-SNAPSHOT</version>
        <version>jiayan</version>
    </parent>

    <artifactId>hx-common</artifactId>
@@ -21,7 +21,7 @@
            <artifactId>jaxb-api</artifactId>
        </dependency>

        <dependency>
      <!--  <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-ooxml</artifactId>
            <version>3.9</version>
@@ -31,7 +31,7 @@
                    <groupId>dom4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency>-->

        <!--腾讯云 cos-->
        <dependency>
@@ -117,11 +117,6 @@
        <dependency>
            <groupId>commons-io</groupId>
            <artifactId>commons-io</artifactId>
        </dependency>
        <!-- excel2003使用的jar -->
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi</artifactId>
        </dependency>
        <dependency>
            <groupId>redis.clients</groupId>
@@ -295,6 +290,13 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>

        <!-- https://mvnrepository.com/artifact/com.monitorjbl/xlsx-streamer -->
        <dependency>
            <groupId>com.monitorjbl</groupId>
            <artifactId>xlsx-streamer</artifactId>
        </dependency>

    </dependencies>

    <build>