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

 Conflicts:

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

	ruoyi-ui/src/components/Editor/index.vue

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

@@ -147,10 +147,10 @@ public class GenUtils
      */
     public static String getBusinessName(String tableName)
     {
-        int lastIndex = tableName.indexOf("_");
+        int lastIndex = tableName.lastIndexOf("_");
         int nameLength = tableName.length();
         String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength);
-        return StringUtils.toCamelCase(businessName);
+        return businessName;
     }
 
     /**
@@ -195,7 +195,7 @@ public class GenUtils
     /**
      * 关键字替换
      * 
-     * @param name 需要被替换的名字
+     * @param text 需要被替换的名字
      * @return 替换后的名字
      */
     public static String replaceText(String text)

ruoyi-ui/src/components/Editor/index.vue

@@ -66,7 +66,6 @@ export default {
       content: this.value,
       uploadImgUrl: "",
       editorOption: {
-        placeholder: "",
         theme: "snow", // or 'bubble'
         placeholder: "请输入内容",
         modules: {
@@ -146,6 +145,7 @@ export default {
 
 <style>
 .editor {
+  white-space: pre-wrap!important;
   line-height: normal !important;
   height: 192px;
 }