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

zss

16 小时以前 2be29256f04c9822dc793c75dfae16c3262d2faf

 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>