Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

7 天以前 408bab8b1c0c10514b8395cff92e47751e4dcdcd

 pom.xml

@@ -39,6 +39,7 @@
        <tomcat.version>9.0.102</tomcat.version>

        <minio.version>8.4.3</minio.version>

        <okhttp.version>4.9.0</okhttp.version>

        <hutool.version>5.8.18</hutool.version>

        <logback.version>1.2.13</logback.version>

        <spring-security.version>5.7.12</spring-security.version>

        <spring-framework.version>5.3.39</spring-framework.version>

@@ -314,6 +315,20 @@
            <version>${getui-sdk.version}</version>

            <scope>compile</scope>

        </dependency>

    
        <!--hutool工具包-->

        <dependency>

            <groupId>cn.hutool</groupId>

            <artifactId>hutool-all</artifactId>

            <version>${hutool.version}</version>

        </dependency>



        <dependency>

            <groupId>cn.hutool</groupId>

            <artifactId>hutool-all</artifactId>

            <version>5.8.43</version>

        </dependency>





    </dependencies>