Merge remote-tracking branch 'origin/master'

liding

2025-05-07 0ddea65ff88b3b750ff14d9deb51fa0cda8e52a1

 src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java

@@ -20,10 +20,9 @@
        try

        {

            // 加载classpath目录下的vm文件

            p.setProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");

            p.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");

            // 定义字符集

            p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8);

            p.setProperty(Velocity.OUTPUT_ENCODING, Constants.UTF8);

            // 初始化Velocity引擎，指定配置Properties

            Velocity.init(p);

        }