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

疯狂的狮子li

2022-02-14 ee2f74dc5e8495e82dd2a3c27e1ac37849c8c455

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

@@ -207,8 +207,7 @@
     */
    public static String getPackagePrefix(String packageName) {
        int lastIndex = packageName.lastIndexOf(".");
        String basePackage = StringUtils.substring(packageName, 0, lastIndex);
        return basePackage;
        return StringUtils.substring(packageName, 0, lastIndex);
    }

    /**