Merge remote-tracking branch 'origin/master' into hckx

maven

2 天以前 3fd5bd656683c482141b13cfdb953d17ba377f1f

 pom.xml

@@ -110,6 +110,13 @@
            <scope>runtime</scope>

        </dependency>



        <!-- FreeMarker 模板引擎：处理变量占位符 -->

        <dependency>

            <groupId>org.freemarker</groupId>

            <artifactId>freemarker</artifactId>

            <version>2.3.32</version>

        </dependency>



        <!-- pagehelper 分页插件 -->

        <dependency>

            <groupId>com.github.pagehelper</groupId>

@@ -289,6 +296,12 @@
            <version>1.12.2</version>

        </dependency>



        <dependency>

            <groupId>com.alibaba</groupId>

            <artifactId>easyexcel</artifactId>

            <version>4.0.3</version>

        </dependency>



    </dependencies>



   <build>