Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-07-27 9da9cb370473538e64f34d4b383407f03aef8ae2

Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang

 pom.xml

@@ -34,6 +34,7 @@
        <poi.version>4.1.2</poi.version>
        <com.alibaba.cloud.version>2.2.8.RELEASE</com.alibaba.cloud.version>
        <jta.starter.version>2.7.1</jta.starter.version>
        <commons.utils.version>1.9.4</commons.utils.version>
    </properties>

    <parent>
@@ -183,6 +184,12 @@
            <version>${poi.version}</version>
        </dependency>

        <dependency>
            <groupId>commons-beanutils</groupId>
            <artifactId>commons-beanutils</artifactId>
            <version>${commons.utils.version}</version>
        </dependency>

        <!-- redis连接 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -222,6 +229,10 @@
            <artifactId>dubbo-registry-nacos</artifactId>
        </dependency>
        <dependency>
            <groupId>commons-beanutils</groupId>
            <artifactId>commons-beanutils</artifactId>
        </dependency>
        <dependency>
            <groupId>io.minio</groupId>
            <artifactId>minio</artifactId>
        </dependency>