From 97873a7b2b7bc2ee2d0f3cdb2c2454ff9156dab9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 19 四月 2021 17:43:32 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

---
 ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
index 3b7b3a1..32452b8 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
@@ -22,7 +22,7 @@
             // 鍔犺浇classpath鐩綍涓嬬殑vm鏂囦欢
             p.setProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
             // 瀹氫箟瀛楃闆�
-            p.setProperty(Velocity.ENCODING_DEFAULT, Constants.UTF8);
+            p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8);
             p.setProperty(Velocity.OUTPUT_ENCODING, Constants.UTF8);
             // 鍒濆鍖朧elocity寮曟搸锛屾寚瀹氶厤缃甈roperties
             Velocity.init(p);

--
Gitblit v1.9.3