Merge branch 'jtwy' into dev_New

zss

9 天以前 2757f1d46f388f684aad93b3dc7ad805c45c6248

 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>