Merge branch 'master' of https://sinanoaq.cn:8888/r/swspkmas into zf1

zf

2023-09-12 9b3a4c27da3d2da9017a289ed38b27d22f571e91

 pom.xml

@@ -30,6 +30,9 @@
        <poi.version>4.1.2</poi.version>
        <velocity.version>2.3</velocity.version>
        <jwt.version>0.9.1</jwt.version>
        <mybatis-plus.version>3.5.2</mybatis-plus.version>
        <hutool.version>5.5.7</hutool.version>

    </properties>

    <!-- 依赖声明 -->
@@ -169,7 +172,40 @@
                <artifactId>ruoyi-common</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>
            <!--文件模块-->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>ruoyi-file</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>
            <!--考试系统-->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>exam-system</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>
            <!--mybatis-plus-->
            <dependency>
                <groupId>com.baomidou</groupId>
                <artifactId>mybatis-plus-boot-starter</artifactId>
                <version>${mybatis-plus.version}</version>
            </dependency>

            <dependency>
                <groupId>cn.hutool</groupId>
                <artifactId>hutool-all</artifactId>
                <version>${hutool.version}</version>
            </dependency>
            <dependency>
                <groupId>org.apache.httpcomponents</groupId>
                <artifactId>httpclient</artifactId>
                <version>4.5.14</version>
            </dependency>
            <dependency>
                <groupId>com.google.code.gson</groupId>
                <artifactId>gson</artifactId>
                <version>2.8.5</version>
            </dependency>
        </dependencies>
    </dependencyManagement>

@@ -180,6 +216,8 @@
        <module>ruoyi-quartz</module>
        <module>ruoyi-generator</module>
        <module>ruoyi-common</module>
        <module>ruoyi-file</module>
        <module>exam-system</module>
    </modules>
    <packaging>pom</packaging>