Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

RuoYi

2020-08-07 a7eb07c7a0afb7da1eb9eb1bd902b0cec77921e2

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

 ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java

@@ -195,7 +195,7 @@
    /**

     * 关键字替换

     * 

     * @param name 需要被替换的名字

     * @param text 需要被替换的名字

     * @return 替换后的名字

     */

    public static String replaceText(String text)