diff --git a/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index fe0ed7b29b1ac45abf13e14e73e09528f5c7dbb2..f00bb53a8d1587de5153fd354be1cd1dd04cd0f1 100644
--- a/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -51,6 +51,7 @@ public class VelocityUtils
         velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
         velocityContext.put("columns", genTable.getColumns());
         velocityContext.put("table", genTable);
+        velocityContext.put("nowDate", DateUtils.getTime());
         if (GenConstants.TPL_TREE.equals(tplCategory))
         {
             setTreeVelocityContext(velocityContext, genTable);
diff --git a/ruoyi-service/ruoyi-gen/src/main/resources/generator.yml b/ruoyi-service/ruoyi-gen/src/main/resources/generator.yml
index fedd7cf66e94385d9465752d7b4788327973c86c..8884260b07e98994723b2f24c85463ddc7ef27fb 100644
--- a/ruoyi-service/ruoyi-gen/src/main/resources/generator.yml
+++ b/ruoyi-service/ruoyi-gen/src/main/resources/generator.yml
@@ -5,7 +5,7 @@ gen:
   author: ruoyi
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
   packageName: com.ruoyi.system
-  # 自动去除表前缀，默认是false
-  autoRemovePre: false
-  # 表前缀(类名不会包含表前缀)
+  # 自动去除表前缀，默认是true
+  autoRemovePre: true
+  # 表前缀(类名不会包含表前缀)开发时改为自己的表前缀
   tablePrefix: sys_
\ No newline at end of file
diff --git a/ruoyi-service/ruoyi-gen/src/main/resources/vm/sql/sql.vm b/ruoyi-service/ruoyi-gen/src/main/resources/vm/sql/sql.vm
index 4b85bdbbf99018087e6132dbba0aa80553b47ec4..ea0b5ca34e9f576d2206b1902ff6a16312ef5880 100644
--- a/ruoyi-service/ruoyi-gen/src/main/resources/vm/sql/sql.vm
+++ b/ruoyi-service/ruoyi-gen/src/main/resources/vm/sql/sql.vm
@@ -1,19 +1,18 @@
--- 菜单 SQL
-insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}', '3', '1', '/${moduleName}/${businessName}', 'C', '0', '${permissionPrefix}:view', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '${functionName}菜单');
+insert into sys_menu (menu_name, menu_key, component, parent_id, target, order_num, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}管理', '${businessName}', '/${moduleName}/${ClassName}List','1', '', '1', 'C', '0', '${permissionPrefix}:view', '#', 'admin', '${nowDate}', 'ry', '${nowDate}', '${functionName}菜单');
 
 -- 按钮父菜单ID
 SELECT @parentId := LAST_INSERT_ID();
 
 -- 按钮 SQL
-insert into sys_menu  (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}查询', @parentId, '1',  '#',  'F', '0', '${permissionPrefix}:list',         '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+insert into sys_menu  (menu_name, menu_key, component, parent_id, target, order_num, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}查询', '', NULL, @parentId, '', '1',  'F', '0', '${permissionPrefix}:list',         '#', 'admin', '${nowDate}', 'ry', '${nowDate}', '');
 
-insert into sys_menu  (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}新增', @parentId, '2',  '#',  'F', '0', '${permissionPrefix}:add',          '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+insert into sys_menu  (menu_name, menu_key, component, parent_id, target, order_num, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}新增', '', NULL, @parentId, '', '2',  'F', '0', '${permissionPrefix}:add',          '#', 'admin', '${nowDate}', 'ry', '${nowDate}', '');
 
-insert into sys_menu  (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}修改', @parentId, '3',  '#',  'F', '0', '${permissionPrefix}:edit',         '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+insert into sys_menu  (menu_name, menu_key, component, parent_id, target, order_num, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}修改', '', NULL, @parentId, '', '3',  'F', '0', '${permissionPrefix}:edit',         '#', 'admin', '${nowDate}', 'ry', '${nowDate}', '');
 
-insert into sys_menu  (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}删除', @parentId, '4',  '#',  'F', '0', '${permissionPrefix}:remove',       '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+insert into sys_menu  (menu_name, menu_key, component, parent_id, target, order_num, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}删除', '', NULL, @parentId, '', '4',  'F', '0', '${permissionPrefix}:remove',       '#', 'admin', '${nowDate}', 'ry', '${nowDate}', '');
diff --git a/ruoyi-service/ruoyi-gen/src/main/resources/vm/vue/list.vue.vm b/ruoyi-service/ruoyi-gen/src/main/resources/vm/vue/list.vue.vm
index 81837bfea832fae1fc45af6ea71762b7aab42998..0a3cd1cc29bd187e45076ac4a17e520bf7e8b411 100644
--- a/ruoyi-service/ruoyi-gen/src/main/resources/vm/vue/list.vue.vm
+++ b/ruoyi-service/ruoyi-gen/src/main/resources/vm/vue/list.vue.vm
@@ -58,7 +58,7 @@
 
 <script>
 import { STable } from '@/components'
-import { get${ClassName}List, del${ClassName} } from '@/api/${moduleName}/${className}'
+import { get${ClassName}List, del${ClassName} } from '@/api/${moduleName}'
 import ${ClassName}Modal from './modules/${ClassName}Modal.vue'
 import { checkPermission } from '@/utils/permissions'
 
@@ -119,7 +119,7 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        return get${className}List(Object.assign(parameter, this.queryParam))
+        return get${ClassName}List(Object.assign(parameter, this.queryParam))
       },
       selectedRowKeys: [],
       selectedRows: [],
@@ -149,7 +149,7 @@ export default {
     },
 #set($foo="$")
     delByIds (ids) {
-      del${className}({ ids: ids.join(',') }).then(res => {
+      del${ClassName}({ ids: ids.join(',') }).then(res => {
         if (res.code === 0) {
           this.${foo}message.success('删除成功')
           this.handleOk()
diff --git a/ruoyi-service/ruoyi-gen/src/main/resources/vm/vue/modal.vue.vm b/ruoyi-service/ruoyi-gen/src/main/resources/vm/vue/modal.vue.vm
index 0b90bdd1fcd34467b11680239e3982c8b05e9b86..dadeada3a24600d2da4766d1908b4ae9edcb7045 100644
--- a/ruoyi-service/ruoyi-gen/src/main/resources/vm/vue/modal.vue.vm
+++ b/ruoyi-service/ruoyi-gen/src/main/resources/vm/vue/modal.vue.vm
@@ -32,7 +32,7 @@
   </a-modal>
 </template>
 <script>
-import { save${ClassName} } from '@/api/${moduleName}/${className}'
+import { save${ClassName} } from '@/api/${moduleName}'
 import pick from 'lodash.pick'
 export default {
   name: '${ClassName}Modal',