diff --git a/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-generator/src/main/resources/generator.yml
index d98a530..247b94c 100644
--- a/ruoyi-generator/src/main/resources/generator.yml
+++ b/ruoyi-generator/src/main/resources/generator.yml
@@ -3,10 +3,10 @@ gen:
   # 作者
   author: zcc
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.cyl.wms
+  packageName: com.cyl.mall
   # 自动去除表前缀，默认是false
   autoRemovePre: false
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
-  tablePrefix: wms_
+  tablePrefix: mall_
   # 一级权限名
-  rootPermission: wms
+  rootPermission: mall
diff --git a/ruoyi-generator/src/test/resources/sql/data.sql b/ruoyi-generator/src/test/resources/sql/data.sql
deleted file mode 100644
index 0ab86bb..0000000
--- a/ruoyi-generator/src/test/resources/sql/data.sql
+++ /dev/null
@@ -1,213 +0,0 @@
-INSERT INTO gen_table(create_by, create_time, update_by, update_time, remark, table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name,
-                      function_author, gen_type, gen_path, options)
-VALUES (NULL, NULL, NULL, NULL, NULL, 177, 'sys_post', '岗位信息表', NULL, NULL, 'SysPost', 'crud', 'com.ruoyi.project.system', 'system', 'post', '岗位信息', 'ruoyi', NULL, 'src', '{}'),
-       (NULL, NULL, NULL, NULL, NULL, 189, 'sys_dict_type', '字典类型表', NULL, NULL, 'SysDictType', 'crud', 'com.ruoyi.project.system', 'system', 'type', '字典类型', 'ruoyi', NULL, 'src', NULL),
-       (NULL, NULL, NULL, NULL, NULL, 200, 'sys_dict_data', '字典数据表', NULL, NULL, 'SysDictData', 'crud', 'com.ruoyi.project.system', 'system', 'data', '字典数据', 'ruoyi', NULL, 'src', NULL),
-       (NULL, NULL, NULL, NULL, NULL, 188, 'sys_logininfor', '系统访问记录', NULL, NULL, 'SysLogininfor', 'crud', 'com.ruoyi.project.system', 'system', 'logininfor', '系统访问记录', 'ruoyi', NULL, 'src', NULL),
-       (NULL, NULL, NULL, NULL, NULL, 197, 'sys_job_log', '定时任务调度日志表', NULL, NULL, 'SysJobLog', 'crud', 'com.ruoyi.project.system', 'system', 'log', '定时任务调度日志', 'ruoyi', NULL, 'src', NULL),
-       (NULL, NULL, NULL, NULL, NULL, 190, 'sys_oper_log', '操作日志记录', NULL, NULL, 'SysOperLog', 'crud', 'com.ruoyi.project.system', 'system', 'log', '操作日志记录', 'ruoyi', NULL, 'src', '{}'),
-       (NULL, NULL, NULL, NULL, NULL, 186, 'sys_user', '用户信息表', NULL, NULL, 'SysUser', 'crud', 'com.ruoyi.project.system', 'system', 'user', '用户信息', 'ruoyi', NULL, 'src', '{}'),
-       (NULL, NULL, NULL, NULL, NULL, 193, 'sys_role_menu', '角色和菜单关联表', NULL, NULL, 'SysRoleMenu', 'crud', 'com.ruoyi.project.system', 'system', 'menu', '角色和菜单关联', 'ruoyi', NULL, 'src', NULL),
-       (NULL, NULL, NULL, NULL, NULL, 196, 'sys_job_log', '定时任务调度日志表', NULL, NULL, 'SysJobLog', 'crud', 'com.ruoyi.project.system', 'system', 'log', '定时任务调度日志', 'ruoyi', NULL, 'src', NULL),
-       (NULL, NULL, NULL, NULL, NULL, 203, 'sys_job', '定时任务调度表', NULL, NULL, 'SysJob', 'crud', 'com.ruoyi.project.system', 'system', 'job', '定时任务调度', 'ruoyi', NULL, 'src', '{}'),
-       (NULL, NULL, NULL, NULL, NULL, 178, 'sys_role', '角色信息表', '', '', 'SysRole', 'crud', 'com.ruoyi.project.system', 'system', 'role', '角色信息', 'ruoyi', NULL, 'src', '{}'),
-       (NULL, NULL, NULL, NULL, NULL, 187, 'sys_notice', '通知公告表', NULL, NULL, 'SysNotice', 'crud', 'com.ruoyi.project.system', 'system', 'notice', '通知公告', 'ruoyi', NULL, 'src', '{}'),
-       (NULL, NULL, NULL, NULL, NULL, 202, 'sys_role_dept', '角色和部门关联表', NULL, NULL, 'SysRoleDept', 'crud', 'com.ruoyi.project.system', 'system', 'dept', '角色和部门关联', 'ruoyi', NULL, 'src', NULL),
-       (NULL, NULL, NULL, NULL, NULL, 191, 'sys_user_post', '用户与岗位关联表', NULL, NULL, 'SysUserPost', 'crud', 'com.ruoyi.project.system', 'system', 'post', '用户与岗位关联', 'ruoyi', NULL, 'src', '{}'),
-       (NULL, NULL, NULL, NULL, NULL, 176, 'sys_menu', '菜单权限表', '', '', 'SysMenu', 'tree', 'com.ruoyi.project.system', 'system', 'menu', '菜单权限', 'ruoyi', NULL, 'src', '{"treeCode":"menu_id","treeName":"menu_name",
-"treeParentCode":"parent_id"}'),
-       (NULL, NULL, NULL, NULL, NULL, 195, 'sys_job_log', '定时任务调度日志表', NULL, NULL, 'SysJobLog', 'crud', 'com.ruoyi.project.system', 'system', 'log', '定时任务调度日志', 'ruoyi', NULL, 'src', NULL),
-       (NULL, NULL, NULL, NULL, NULL, 199, 'sys_config', '参数配置表', NULL, NULL, 'SysConfig', 'crud', 'com.ruoyi.project.system', 'system', 'config', '参数配置', 'ruoyi', NULL, 'src', NULL),
-       (NULL, NULL, NULL, NULL, NULL, 201, 'sys_dept', '部门表', NULL, NULL, 'SysDept', 'crud', 'com.ruoyi.project.system', 'system', 'dept', '部门', 'ruoyi', NULL, 'src', NULL),
-       (NULL, NULL, NULL, NULL, NULL, 194, 'sys_user_role', '用户和角色关联表', NULL, NULL, 'SysUserRole', 'crud', 'com.ruoyi.project.system', 'system', 'role', '用户和角色关联', 'ruoyi', NULL, 'src', NULL);
-INSERT INTO gen_table_column(create_by, create_time, update_by, update_time, column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query,
-                             query_type, html_type, dict_type, sort)
-VALUES (NULL, NULL, NULL, NULL, 1866, 177, 'post_id', '岗位ID', 'bigint(20)', 'Long', 'postId', '1', '1', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 1867, 177, 'post_code', '编号', 'varchar(64)', 'String', 'postCode', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 2),
-       (NULL, NULL, NULL, NULL, 1868, 177, 'post_name', '公共关系维护板块（0 媒体 1 监管部门）', 'varchar(50)', 'String', 'postName', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'radio', '', 3),
-       (NULL, NULL, NULL, NULL, 1869, 177, 'post_sort', '性别（0 男 1 女）', 'int(4)', 'Integer', 'postSort', '0', '0', '1', '1', '1', '1', NULL, 'EQ', 'radio', '', 4),
-       (NULL, NULL, NULL, NULL, 1870, 177, 'status', '类别（0传统媒体 1自媒体 2网络媒体）', 'char(1)', 'String', 'status', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'radio', '', 5),
-       (NULL, NULL, NULL, NULL, 1871, 177, 'create_by', '对接人', 'varchar(64)', 'String', 'createBy', '0', '0', '1', '1', '1', '1', NULL, 'EQ', 'input', '', 6),
-       (NULL, NULL, NULL, NULL, 1872, 177, 'create_time', '对业务关注度（0 较高 1 高）', 'datetime', 'String', 'createTime', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'radio', '', 7),
-       (NULL, NULL, NULL, NULL, 1873, 177, 'update_by', '媒体名称', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 8),
-       (NULL, NULL, NULL, NULL, 1874, 177, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'datetime', '', 9),
-       (NULL, NULL, NULL, NULL, 1875, 177, 'remark', '层级（0 中层 1 基层）', 'varchar(500)', 'String', 'remark', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'radio', '', 10),
-       (NULL, NULL, NULL, NULL, 1981, 189, 'dict_id', '字典主键', 'bigint(20)', 'Long', 'dictId', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 1982, 189, 'dict_name', '字典名称', 'varchar(100)', 'String', 'dictName', '0', '0', NULL, '1', '1', '1', '1', 'LIKE', 'input', '', 2),
-       (NULL, NULL, NULL, NULL, 1983, 189, 'dict_type', '字典类型', 'varchar(100)', 'String', 'dictType', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'select', '', 3),
-       (NULL, NULL, NULL, NULL, 1984, 189, 'status', '状态（0正常 1停用）', 'char(1)', 'String', 'status', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'radio', '', 4),
-       (NULL, NULL, NULL, NULL, 1985, 189, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 5),
-       (NULL, NULL, NULL, NULL, 1986, 189, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 6),
-       (NULL, NULL, NULL, NULL, 1987, 189, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 7),
-       (NULL, NULL, NULL, NULL, 1988, 189, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 8),
-       (NULL, NULL, NULL, NULL, 1989, 189, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'textarea', '', 9),
-       (NULL, NULL, NULL, NULL, 2058, 200, 'dict_code', '字典编码', 'bigint(20)', 'Long', 'dictCode', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 2059, 200, 'dict_sort', '字典排序', 'int(4)', 'Integer', 'dictSort', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 2),
-       (NULL, NULL, NULL, NULL, 2060, 200, 'dict_label', '字典标签', 'varchar(100)', 'String', 'dictLabel', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 3),
-       (NULL, NULL, NULL, NULL, 2061, 200, 'dict_value', '字典键值', 'varchar(100)', 'String', 'dictValue', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 4),
-       (NULL, NULL, NULL, NULL, 2062, 200, 'dict_type', '字典类型', 'varchar(100)', 'String', 'dictType', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'select', '', 5),
-       (NULL, NULL, NULL, NULL, 2063, 200, 'css_class', '样式属性（其他样式扩展）', 'varchar(100)', 'String', 'cssClass', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 6),
-       (NULL, NULL, NULL, NULL, 2064, 200, 'list_class', '表格回显样式', 'varchar(100)', 'String', 'listClass', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 7),
-       (NULL, NULL, NULL, NULL, 2065, 200, 'is_default', '是否默认（Y是 N否）', 'char(1)', 'String', 'isDefault', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 8),
-       (NULL, NULL, NULL, NULL, 2066, 200, 'status', '状态（0正常 1停用）', 'char(1)', 'String', 'status', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'radio', '', 9),
-       (NULL, NULL, NULL, NULL, 2067, 200, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 10),
-       (NULL, NULL, NULL, NULL, 2068, 200, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 11),
-       (NULL, NULL, NULL, NULL, 2069, 200, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 12),
-       (NULL, NULL, NULL, NULL, 2070, 200, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 13),
-       (NULL, NULL, NULL, NULL, 2071, 200, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'textarea', '', 14),
-       (NULL, NULL, NULL, NULL, 1972, 188, 'info_id', '访问ID', 'bigint(20)', 'Long', 'infoId', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 1973, 188, 'user_name', '用户账号', 'varchar(50)', 'String', 'userName', '0', '0', NULL, '1', '1', '1', '1', 'LIKE', 'input', '', 2),
-       (NULL, NULL, NULL, NULL, 1974, 188, 'ipaddr', '登录IP地址', 'varchar(128)', 'String', 'ipaddr', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 3),
-       (NULL, NULL, NULL, NULL, 1975, 188, 'login_location', '登录地点', 'varchar(255)', 'String', 'loginLocation', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 4),
-       (NULL, NULL, NULL, NULL, 1976, 188, 'browser', '浏览器类型', 'varchar(50)', 'String', 'browser', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 5),
-       (NULL, NULL, NULL, NULL, 1977, 188, 'os', '操作系统', 'varchar(50)', 'String', 'os', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 6),
-       (NULL, NULL, NULL, NULL, 1978, 188, 'status', '登录状态（0成功 1失败）', 'char(1)', 'String', 'status', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'radio', '', 7),
-       (NULL, NULL, NULL, NULL, 1979, 188, 'msg', '提示消息', 'varchar(255)', 'String', 'msg', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 8),
-       (NULL, NULL, NULL, NULL, 1980, 188, 'login_time', '访问时间', 'datetime', 'Date', 'loginTime', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'datetime', '', 9),
-       (NULL, NULL, NULL, NULL, 2030, 197, 'job_log_id', '任务日志ID', 'bigint(20)', 'Long', 'jobLogId', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 2031, 197, 'job_name', '任务名称', 'varchar(64)', 'String', 'jobName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 2),
-       (NULL, NULL, NULL, NULL, 2032, 197, 'job_group', '任务组名', 'varchar(64)', 'String', 'jobGroup', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 3),
-       (NULL, NULL, NULL, NULL, 2033, 197, 'invoke_target', '调用目标字符串', 'varchar(500)', 'String', 'invokeTarget', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'textarea', '', 4),
-       (NULL, NULL, NULL, NULL, 2034, 197, 'job_message', '日志信息', 'varchar(500)', 'String', 'jobMessage', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'textarea', '', 5),
-       (NULL, NULL, NULL, NULL, 2035, 197, 'status', '执行状态（0正常 1失败）', 'char(1)', 'String', 'status', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'radio', '', 6),
-       (NULL, NULL, NULL, NULL, 2036, 197, 'exception_info', '异常信息', 'varchar(2000)', 'String', 'exceptionInfo', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'textarea', '', 7),
-       (NULL, NULL, NULL, NULL, 2037, 197, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 8),
-       (NULL, NULL, NULL, NULL, 1990, 190, 'oper_id', '日志主键', 'bigint(20)', 'Long', 'operId', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', 'sys_user_sex', 1),
-       (NULL, NULL, NULL, NULL, 1991, 190, 'title', '模块标题', 'varchar(50)', 'String', 'title', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 2),
-       (NULL, NULL, NULL, NULL, 1992, 190, 'business_type', '业务类型（0其它 1新增 2修改 3删除）', 'int(2)', 'Integer', 'businessType', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'select', '', 3),
-       (NULL, NULL, NULL, NULL, 1993, 190, 'method', '方法名称', 'varchar(100)', 'String', 'method', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 4),
-       (NULL, NULL, NULL, NULL, 1994, 190, 'request_method', '请求方式', 'varchar(10)', 'String', 'requestMethod', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 5),
-       (NULL, NULL, NULL, NULL, 1995, 190, 'operator_type', '操作类别（0其它 1后台用户 2手机端用户）', 'int(1)', 'Integer', 'operatorType', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'select', '', 6),
-       (NULL, NULL, NULL, NULL, 1996, 190, 'oper_name', '操作人员', 'varchar(50)', 'String', 'operName', '0', '0', NULL, '1', '1', '1', '1', 'LIKE', 'input', '', 7),
-       (NULL, NULL, NULL, NULL, 1997, 190, 'dept_name', '部门名称', 'varchar(50)', 'String', 'deptName', '0', '0', NULL, '1', '1', '1', '1', 'LIKE', 'input', '', 8),
-       (NULL, NULL, NULL, NULL, 1998, 190, 'oper_url', '请求URL', 'varchar(255)', 'String', 'operUrl', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 9),
-       (NULL, NULL, NULL, NULL, 1999, 190, 'oper_ip', '主机地址', 'varchar(128)', 'String', 'operIp', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 10),
-       (NULL, NULL, NULL, NULL, 2000, 190, 'oper_location', '操作地点', 'varchar(255)', 'String', 'operLocation', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 11),
-       (NULL, NULL, NULL, NULL, 2001, 190, 'oper_param', '请求参数', 'varchar(2000)', 'String', 'operParam', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'textarea', '', 12),
-       (NULL, NULL, NULL, NULL, 2002, 190, 'json_result', '返回参数', 'varchar(2000)', 'String', 'jsonResult', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'textarea', '', 13),
-       (NULL, NULL, NULL, NULL, 2003, 190, 'status', '操作状态（0正常 1异常）', 'int(1)', 'Integer', 'status', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'radio', '', 14),
-       (NULL, NULL, NULL, NULL, 2004, 190, 'error_msg', '错误消息', 'varchar(2000)', 'String', 'errorMsg', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'textarea', '', 15),
-       (NULL, NULL, NULL, NULL, 2005, 190, 'oper_time', '操作时间', 'datetime', 'Date', 'operTime', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'datetime', '', 16),
-       (NULL, NULL, NULL, NULL, 1943, 186, 'user_id', '用户ID', 'bigint(20)', 'Long', 'userId', '1', '1', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 1944, 186, 'dept_id', '部门ID', 'bigint(20)', 'Long', 'deptId', '0', '0', NULL, NULL, NULL, '1', '1', 'EQ', 'input', '', 2),
-       (NULL, NULL, NULL, NULL, 1945, 186, 'user_name', '用户账号', 'varchar(30)', 'String', 'userName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 3),
-       (NULL, NULL, NULL, NULL, 1946, 186, 'nick_name', '用户昵称', 'varchar(30)', 'String', 'nickName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 4),
-       (NULL, NULL, NULL, NULL, 1947, 186, 'user_type', '用户类型（00系统用户）', 'varchar(2)', 'String', 'userType', '0', '0', NULL, NULL, NULL, '1', '1', 'EQ', 'select', '', 5),
-       (NULL, NULL, NULL, NULL, 1948, 186, 'email', '用户邮箱', 'varchar(50)', 'String', 'email', '0', '0', NULL, NULL, NULL, '1', '1', 'EQ', 'input', '', 6),
-       (NULL, NULL, NULL, NULL, 1949, 186, 'phonenumber', '手机号码', 'varchar(11)', 'String', 'phonenumber', '0', '0', NULL, NULL, NULL, '1', '1', 'EQ', 'input', '', 7),
-       (NULL, NULL, NULL, NULL, 1950, 186, 'sex', '用户性别（0男 1女 2未知）', 'char(1)', 'String', 'sex', '0', '0', NULL, NULL, NULL, '1', '1', 'EQ', 'select', 'sys_user_sex', 8),
-       (NULL, NULL, NULL, NULL, 1951, 186, 'avatar', '头像地址', 'varchar(100)', 'String', 'avatar', '0', '0', NULL, NULL, NULL, '1', '1', 'EQ', 'input', '', 9),
-       (NULL, NULL, NULL, NULL, 1952, 186, 'password', '密码', 'varchar(100)', 'String', 'password', '0', '0', NULL, NULL, NULL, '1', '1', 'EQ', 'input', '', 10),
-       (NULL, NULL, NULL, NULL, 1953, 186, 'status', '帐号状态（0正常 1停用）', 'char(1)', 'String', 'status', '0', '0', NULL, NULL, NULL, '1', '1', 'EQ', 'radio', '', 11),
-       (NULL, NULL, NULL, NULL, 1954, 186, 'del_flag', '删除标志（0代表存在 2代表删除）', 'char(1)', 'String', 'delFlag', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 12),
-       (NULL, NULL, NULL, NULL, 1955, 186, 'login_ip', '最后登录IP', 'varchar(128)', 'String', 'loginIp', '0', '0', NULL, NULL, NULL, '1', '1', 'EQ', 'input', '', 13),
-       (NULL, NULL, NULL, NULL, 1956, 186, 'login_date', '最后登录时间', 'datetime', 'Date', 'loginDate', '0', '0', NULL, NULL, NULL, '1', '1', 'EQ', 'datetime', '', 14),
-       (NULL, NULL, NULL, NULL, 1957, 186, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 15),
-       (NULL, NULL, NULL, NULL, 1958, 186, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'datetime', '', 16),
-       (NULL, NULL, NULL, NULL, 1959, 186, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 17),
-       (NULL, NULL, NULL, NULL, 1960, 186, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'datetime', '', 18),
-       (NULL, NULL, NULL, NULL, 1961, 186, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, NULL, NULL, '1', NULL, 'EQ', 'textarea', '', 19),
-       (NULL, NULL, NULL, NULL, 2010, 193, 'role_id', '角色ID', 'bigint(20)', 'Long', 'roleId', '1', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 2011, 193, 'menu_id', '菜单ID', 'bigint(20)', 'Long', 'menuId', '1', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 2),
-       (NULL, NULL, NULL, NULL, 2022, 196, 'job_log_id', '任务日志ID', 'bigint(20)', 'Long', 'jobLogId', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 2023, 196, 'job_name', '任务名称', 'varchar(64)', 'String', 'jobName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 2),
-       (NULL, NULL, NULL, NULL, 2024, 196, 'job_group', '任务组名', 'varchar(64)', 'String', 'jobGroup', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 3),
-       (NULL, NULL, NULL, NULL, 2025, 196, 'invoke_target', '调用目标字符串', 'varchar(500)', 'String', 'invokeTarget', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'textarea', '', 4),
-       (NULL, NULL, NULL, NULL, 2026, 196, 'job_message', '日志信息', 'varchar(500)', 'String', 'jobMessage', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'textarea', '', 5),
-       (NULL, NULL, NULL, NULL, 2027, 196, 'status', '执行状态（0正常 1失败）', 'char(1)', 'String', 'status', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'radio', '', 6),
-       (NULL, NULL, NULL, NULL, 2028, 196, 'exception_info', '异常信息', 'varchar(2000)', 'String', 'exceptionInfo', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'textarea', '', 7),
-       (NULL, NULL, NULL, NULL, 2029, 196, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 8),
-       (NULL, NULL, NULL, NULL, 2088, 203, 'job_id', '任务ID', 'bigint(20)', 'Long', 'jobId', '1', '1', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 2089, 203, 'job_name', '任务名称', 'varchar(64)', 'String', 'jobName', '1', '0', NULL, '1', NULL, NULL, NULL, 'LIKE', 'input', '', 2),
-       (NULL, NULL, NULL, NULL, 2090, 203, 'job_group', '任务组名', 'varchar(64)', 'String', 'jobGroup', '1', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 3),
-       (NULL, NULL, NULL, NULL, 2091, 203, 'invoke_target', '调用目标字符串', 'varchar(500)', 'String', 'invokeTarget', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'textarea', '', 4),
-       (NULL, NULL, NULL, NULL, 2092, 203, 'cron_expression', 'cron执行表达式', 'varchar(255)', 'String', 'cronExpression', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 5),
-       (NULL, NULL, NULL, NULL, 2093, 203, 'misfire_policy', '计划执行错误策略（1立即执行 2执行一次 3放弃执行）', 'varchar(20)', 'String', 'misfirePolicy', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 6),
-       (NULL, NULL, NULL, NULL, 2094, 203, 'concurrent', '是否并发执行（0允许 1禁止）', 'char(1)', 'String', 'concurrent', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 7),
-       (NULL, NULL, NULL, NULL, 2095, 203, 'status', '状态（0正常 1暂停）', 'char(1)', 'String', 'status', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'radio', '', 8),
-       (NULL, NULL, NULL, NULL, 2096, 203, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 9),
-       (NULL, NULL, NULL, NULL, 2097, 203, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 10),
-       (NULL, NULL, NULL, NULL, 2098, 203, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 11),
-       (NULL, NULL, NULL, NULL, 2099, 203, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 12),
-       (NULL, NULL, NULL, NULL, 2100, 203, 'remark', '备注信息', 'varchar(500)', 'String', 'remark', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'textarea', '', 13),
-       (NULL, NULL, NULL, NULL, 1876, 178, 'role_id', '角色ID', 'bigint(20)', 'Long', 'roleId', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 1877, 178, 'role_name', '角色名称', 'varchar(30)', 'String', 'roleName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 2),
-       (NULL, NULL, NULL, NULL, 1878, 178, 'role_key', '角色权限字符串', 'varchar(100)', 'String', 'roleKey', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 3),
-       (NULL, NULL, NULL, NULL, 1879, 178, 'role_sort', '显示顺序', 'int(4)', 'Integer', 'roleSort', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 4),
-       (NULL, NULL, NULL, NULL, 1880, 178, 'data_scope', '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）', 'char(1)', 'String', 'dataScope', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 5),
-       (NULL, NULL, NULL, NULL, 1881, 178, 'menu_check_strictly', '菜单树选择项是否关联显示', 'tinyint(1)', 'Integer', 'menuCheckStrictly', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 6),
-       (NULL, NULL, NULL, NULL, 1882, 178, 'dept_check_strictly', '部门树选择项是否关联显示', 'tinyint(1)', 'Integer', 'deptCheckStrictly', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 7),
-       (NULL, NULL, NULL, NULL, 1883, 178, 'status', '角色状态（0正常 1停用）', 'char(1)', 'String', 'status', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'radio', '', 8),
-       (NULL, NULL, NULL, NULL, 1884, 178, 'del_flag', '删除标志（0代表存在 2代表删除）', 'char(1)', 'String', 'delFlag', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 9),
-       (NULL, NULL, NULL, NULL, 1885, 178, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 10),
-       (NULL, NULL, NULL, NULL, 1886, 178, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 11),
-       (NULL, NULL, NULL, NULL, 1887, 178, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 12),
-       (NULL, NULL, NULL, NULL, 1888, 178, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 13),
-       (NULL, NULL, NULL, NULL, 1889, 178, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'textarea', '', 14),
-       (NULL, NULL, NULL, NULL, 1962, 187, 'notice_id', '公告ID', 'int(4)', 'Integer', 'noticeId', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 1963, 187, 'notice_title', '公告标题', 'varchar(50)', 'String', 'noticeTitle', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'imageUpload', '', 2),
-       (NULL, NULL, NULL, NULL, 1964, 187, 'notice_type', '公告类型（1通知 2公告）', 'char(1)', 'String', 'noticeType', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'select', '', 3),
-       (NULL, NULL, NULL, NULL, 1965, 187, 'notice_content', '公告内容', 'longblob', 'String', 'noticeContent', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'editor', '', 4),
-       (NULL, NULL, NULL, NULL, 1966, 187, 'status', '公告状态（0正常 1关闭）', 'char(1)', 'String', 'status', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'radio', '', 5),
-       (NULL, NULL, NULL, NULL, 1967, 187, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 6),
-       (NULL, NULL, NULL, NULL, 1968, 187, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 7),
-       (NULL, NULL, NULL, NULL, 1969, 187, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 8),
-       (NULL, NULL, NULL, NULL, 1970, 187, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 9),
-       (NULL, NULL, NULL, NULL, 1971, 187, 'remark', '备注', 'varchar(255)', 'String', 'remark', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 10),
-       (NULL, NULL, NULL, NULL, 2086, 202, 'role_id', '角色ID', 'bigint(20)', 'Long', 'roleId', '1', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 2087, 202, 'dept_id', '部门ID', 'bigint(20)', 'Long', 'deptId', '1', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 2),
-       (NULL, NULL, NULL, NULL, 2006, 191, 'user_id', '用户ID', 'bigint(20)', 'Long', 'userId1', '1', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 2007, 191, 'post_id', '岗位ID', 'bigint(20)', 'Long', 'postId', '1', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 2),
-       (NULL, NULL, NULL, NULL, 1847, 176, 'menu_id', '菜单ID', 'bigint(20)', 'Long', 'menuId', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 1848, 176, 'menu_name', '菜单名称', 'varchar(50)', 'String', 'menuName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'fileUpload', '', 2),
-       (NULL, NULL, NULL, NULL, 1849, 176, 'parent_id', '父菜单ID', 'bigint(20)', 'Long', 'parentId', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 3),
-       (NULL, NULL, NULL, NULL, 1850, 176, 'order_num', '显示顺序', 'int(4)', 'Integer', 'orderNum', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 4),
-       (NULL, NULL, NULL, NULL, 1851, 176, 'path', '路由地址', 'varchar(200)', 'String', 'path', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 5),
-       (NULL, NULL, NULL, NULL, 1852, 176, 'component', '组件路径', 'varchar(255)', 'String', 'component', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 6),
-       (NULL, NULL, NULL, NULL, 1853, 176, 'query', '路由参数', 'varchar(255)', 'String', 'query', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 7),
-       (NULL, NULL, NULL, NULL, 1854, 176, 'is_frame', '是否为外链（0是 1否）', 'int(1)', 'Integer', 'isFrame', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 8),
-       (NULL, NULL, NULL, NULL, 1855, 176, 'is_cache', '是否缓存（0缓存 1不缓存）', 'int(1)', 'Integer', 'isCache', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 9),
-       (NULL, NULL, NULL, NULL, 1856, 176, 'menu_type', '菜单类型（M目录 C菜单 F按钮）', 'char(1)', 'String', 'menuType', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'select', '', 10),
-       (NULL, NULL, NULL, NULL, 1857, 176, 'visible', '菜单状态（0显示 1隐藏）', 'char(1)', 'String', 'visible', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 11),
-       (NULL, NULL, NULL, NULL, 1858, 176, 'status', '菜单状态（0正常 1停用）', 'char(1)', 'String', 'status', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'radio', '', 12),
-       (NULL, NULL, NULL, NULL, 1859, 176, 'perms', '权限标识', 'varchar(100)', 'String', 'perms', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 13),
-       (NULL, NULL, NULL, NULL, 1860, 176, 'icon', '菜单图标', 'varchar(100)', 'String', 'icon', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'imageUpload', '', 14),
-       (NULL, NULL, NULL, NULL, 1861, 176, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 15),
-       (NULL, NULL, NULL, NULL, 1862, 176, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 16),
-       (NULL, NULL, NULL, NULL, 1863, 176, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 17),
-       (NULL, NULL, NULL, NULL, 1864, 176, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 18),
-       (NULL, NULL, NULL, NULL, 1865, 176, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'textarea', '', 19),
-       (NULL, NULL, NULL, NULL, 2014, 195, 'job_log_id', '任务日志ID', 'bigint(20)', 'Long', 'jobLogId', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 2015, 195, 'job_name', '任务名称', 'varchar(64)', 'String', 'jobName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 2),
-       (NULL, NULL, NULL, NULL, 2016, 195, 'job_group', '任务组名', 'varchar(64)', 'String', 'jobGroup', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 3),
-       (NULL, NULL, NULL, NULL, 2017, 195, 'invoke_target', '调用目标字符串', 'varchar(500)', 'String', 'invokeTarget', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'textarea', '', 4),
-       (NULL, NULL, NULL, NULL, 2018, 195, 'job_message', '日志信息', 'varchar(500)', 'String', 'jobMessage', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'textarea', '', 5),
-       (NULL, NULL, NULL, NULL, 2019, 195, 'status', '执行状态（0正常 1失败）', 'char(1)', 'String', 'status', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'radio', '', 6),
-       (NULL, NULL, NULL, NULL, 2020, 195, 'exception_info', '异常信息', 'varchar(2000)', 'String', 'exceptionInfo', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'textarea', '', 7),
-       (NULL, NULL, NULL, NULL, 2021, 195, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 8),
-       (NULL, NULL, NULL, NULL, 2048, 199, 'config_id', '参数主键', 'int(5)', 'Integer', 'configId', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 2049, 199, 'config_name', '参数名称', 'varchar(100)', 'String', 'configName', '0', '0', NULL, '1', '1', '1', '1', 'LIKE', 'input', '', 2),
-       (NULL, NULL, NULL, NULL, 2050, 199, 'config_key', '参数键名', 'varchar(100)', 'String', 'configKey', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 3),
-       (NULL, NULL, NULL, NULL, 2051, 199, 'config_value', '参数键值', 'varchar(500)', 'String', 'configValue', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'textarea', '', 4),
-       (NULL, NULL, NULL, NULL, 2052, 199, 'config_type', '系统内置（Y是 N否）', 'char(1)', 'String', 'configType', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'select', '', 5),
-       (NULL, NULL, NULL, NULL, 2053, 199, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 6),
-       (NULL, NULL, NULL, NULL, 2054, 199, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 7),
-       (NULL, NULL, NULL, NULL, 2055, 199, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 8),
-       (NULL, NULL, NULL, NULL, 2056, 199, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 9),
-       (NULL, NULL, NULL, NULL, 2057, 199, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'textarea', '', 10),
-       (NULL, NULL, NULL, NULL, 2072, 201, 'dept_id', '部门id', 'bigint(20)', 'Long', 'deptId', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 2073, 201, 'parent_id', '父部门id', 'bigint(20)', 'Long', 'parentId', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 2),
-       (NULL, NULL, NULL, NULL, 2074, 201, 'ancestors', '祖级列表', 'varchar(50)', 'String', 'ancestors', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 3),
-       (NULL, NULL, NULL, NULL, 2075, 201, 'dept_name', '部门名称', 'varchar(30)', 'String', 'deptName', '0', '0', NULL, '1', '1', '1', '1', 'LIKE', 'input', '', 4),
-       (NULL, NULL, NULL, NULL, 2076, 201, 'order_num', '显示顺序', 'int(4)', 'Integer', 'orderNum', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 5),
-       (NULL, NULL, NULL, NULL, 2077, 201, 'leader', '负责人', 'varchar(20)', 'String', 'leader', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 6),
-       (NULL, NULL, NULL, NULL, 2078, 201, 'phone', '联系电话', 'varchar(11)', 'String', 'phone', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 7),
-       (NULL, NULL, NULL, NULL, 2079, 201, 'email', '邮箱', 'varchar(50)', 'String', 'email', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 8),
-       (NULL, NULL, NULL, NULL, 2080, 201, 'status', '部门状态（0正常 1停用）', 'char(1)', 'String', 'status', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'radio', '', 9),
-       (NULL, NULL, NULL, NULL, 2081, 201, 'del_flag', '删除标志（0代表存在 2代表删除）', 'char(1)', 'String', 'delFlag', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 10),
-       (NULL, NULL, NULL, NULL, 2082, 201, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 11),
-       (NULL, NULL, NULL, NULL, 2083, 201, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 12),
-       (NULL, NULL, NULL, NULL, 2084, 201, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 13),
-       (NULL, NULL, NULL, NULL, 2085, 201, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 14),
-       (NULL, NULL, NULL, NULL, 2012, 194, 'user_id', '用户ID', 'bigint(20)', 'Long', 'userId', '1', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1),
-       (NULL, NULL, NULL, NULL, 2013, 194, 'role_id', '角色ID', 'bigint(20)', 'Long', 'roleId', '1', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 2);
diff --git a/ruoyi-generator/src/test/resources/sql/init.sql b/ruoyi-generator/src/test/resources/sql/init.sql
deleted file mode 100644
index 0ccc71d..0000000
--- a/ruoyi-generator/src/test/resources/sql/init.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- ----------------------------
--- 19、代码生成业务表
--- ----------------------------
-drop table if exists gen_table;
-create table gen_table (
-  table_id             bigint(20)      not null auto_increment    comment '编号',
-  table_name           varchar(200)    default ''                 comment '表名称',
-  table_comment        varchar(500)    default ''                 comment '表描述',
-  sub_table_name       varchar(64)     default null               comment '关联子表的表名',
-  sub_table_fk_name    varchar(64)     default null               comment '子表关联的外键名',
-  class_name           varchar(100)    default ''                 comment '实体类名称',
-  tpl_category         varchar(200)    default 'crud'             comment '使用的模板（crud单表操作 tree树表操作 sub主子表操作）',
-  package_name         varchar(100)                               comment '生成包路径',
-  module_name          varchar(30)                                comment '生成模块名',
-  business_name        varchar(30)                                comment '生成业务名',
-  function_name        varchar(50)                                comment '生成功能名',
-  function_author      varchar(50)                                comment '生成功能作者',
-  gen_type             char(1)         default '0'                comment '生成代码方式（0zip压缩包 1自定义路径）',
-  gen_path             varchar(200)    default '/'                comment '生成路径（不填默认项目路径）',
-  options              varchar(1000)                              comment '其它生成选项',
-  create_by            varchar(64)     default ''                 comment '创建者',
-  create_time 	       datetime                                   comment '创建时间',
-  update_by            varchar(64)     default ''                 comment '更新者',
-  update_time          datetime                                   comment '更新时间',
-  remark               varchar(500)    default null               comment '备注',
-  primary key (table_id)
-) engine=innodb auto_increment=1 comment = '代码生成业务表';
-
-
--- ----------------------------
--- 20、代码生成业务表字段
--- ----------------------------
-drop table if exists gen_table_column;
-create table gen_table_column (
-  column_id         bigint(20)      not null auto_increment    comment '编号',
-  table_id          varchar(64)                                comment '归属表编号',
-  column_name       varchar(200)                               comment '列名称',
-  column_comment    varchar(500)                               comment '列描述',
-  column_type       varchar(100)                               comment '列类型',
-  java_type         varchar(500)                               comment 'JAVA类型',
-  java_field        varchar(200)                               comment 'JAVA字段名',
-  is_pk             char(1)                                    comment '是否主键（1是）',
-  is_increment      char(1)                                    comment '是否自增（1是）',
-  is_required       char(1)                                    comment '是否必填（1是）',
-  is_insert         char(1)                                    comment '是否为插入字段（1是）',
-  is_edit           char(1)                                    comment '是否编辑字段（1是）',
-  is_list           char(1)                                    comment '是否列表字段（1是）',
-  is_query          char(1)                                    comment '是否查询字段（1是）',
-  query_type        varchar(200)    default 'EQ'               comment '查询方式（等于、不等于、大于、小于、范围）',
-  html_type         varchar(200)                               comment '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）',
-  dict_type         varchar(200)    default ''                 comment '字典类型',
-  sort              int                                        comment '排序',
-  create_by         varchar(64)     default ''                 comment '创建者',
-  create_time 	    datetime                                   comment '创建时间',
-  update_by         varchar(64)     default ''                 comment '更新者',
-  update_time       datetime                                   comment '更新时间',
-  primary key (column_id)
-) engine=innodb auto_increment=1 comment = '代码生成业务表字段';
diff --git a/ruoyi-generator/src/test/resources/vm/java/controller.java.vm b/ruoyi-generator/src/test/resources/vm/java/controller.java.vm
deleted file mode 100644
index 8f4f210..0000000
--- a/ruoyi-generator/src/test/resources/vm/java/controller.java.vm
+++ /dev/null
@@ -1,133 +0,0 @@
-package ${fullPackage};
-
-import cn.hutool.core.date.DatePattern;
-import com.bryx.core.common.base.entity.PageReq;
-import com.bryx.core.common.base.entity.ResultEntity;
-import com.bryx.core.operlog.enums.BusinessType;
-import com.bryx.core.common.util.ExcelUtil2;
-import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.bryx.core.operlog.annotation.Log;
-import com.bryx.core.security.annotation.PreAuth;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import ${packageName}.model.entity.${ClassName};
-import ${packageName}.pojo.query.${ClassName}Query;
-import ${packageName}.service.I${ClassName}Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.Date;
-import java.util.List;
-import java.util.LinkedHashMap;
-/**
- * ${functionName}Controller
- * 
- * @author ${author}
- */
-@RestController
-@RequestMapping("/${className}")
-@Tag(name = "${functionName}")
-@Log(title = "${ClassName}Controller")
-public class ${ClassName}Controller {
-    @Autowired
-    private I${ClassName}Service ${className}Service;
-
-    /**
-     * 查询${functionName}列表
-     */
-    @GetMapping("/list")
-    @PreAuth(hasPerm = "${rootPermission}:${className}:list")
-    @Log(title = "Demo-Test", businessType = BusinessType.SELECT)
-    public ResultEntity<PageInfo<${ClassName}>> list(${ClassName}Query ${className}Query, PageReq pageable) {
-        List<${ClassName}> list = ${className}Service.selectByCondition(${className}Query, pageable);
-        return ResultEntity.of(new PageInfo<>(list));
-    }
-
-    /**
-     * 导出${functionName}列表
-     */
-    @PreAuth(hasPerm = "${rootPermission}:${className}:export')")
-    @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public void export(${ClassName}Query ${className}Query, HttpServletResponse response) throws IOException {
-        List<${ClassName}> list = ${className}Service.selectByCondition(${className}Query);
-        LinkedHashMap<String, String> map = new LinkedHashMap<>();
-#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
-        map.put("${column.javaField}", "${column.genLabel()}");
-#end
-#end
-        String name = "${functionName}_" + DatePattern.PURE_DATETIME_FORMAT.format(new Date());
-
-        response.setHeader("Access-Control-Expose-Headers", "Content-disposition,Content-Type");
-        response.setContentType("application/vnd.ms-excel");
-        response.setHeader("Content-disposition",
-                "attachment;filename*=utf-8''" + URLEncoder.encode(name, "UTF-8") + ".xlsx");
-        response.setCharacterEncoding("utf-8");
-
-        ExcelUtil2.export2(list, response.getOutputStream(), map);
-    }
-
-    /**
-        * 导入${functionName}列表
-        */
-    @PreAuth(hasPerm = "${rootPermission}:${className}:import')")
-    @Log(title = "${functionName}", businessType = BusinessType.IMPORT)
-    @PostMapping("/importData")
-    public ResultEntity<Integer> importData(MultipartFile file) throws Exception {
-        LinkedHashMap<String, String> map = new LinkedHashMap<>();
-#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField) && $column.javaField != $pkColumn.javaField)
-        map.put("${column.genLabel()}", "${column.javaField}");
-#end
-#end
-        List<${ClassName}> list = ExcelUtil2.importExcel(file.getInputStream(), ${ClassName}.class, map);
-        int message = ${className}Service.batchInsert(list);
-        return ResultEntity.of(message);
-    }
-
-    /**
-     * 获取${functionName}详细信息
-     */
-    @PreAuth(hasPerm = "${rootPermission}:${className}:query')")
-    @GetMapping(value = "/{${pkColumn.javaField}}")
-    public ResultEntity<${ClassName}> getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
-        return ResultEntity.of(${className}Service.selectByPrimaryKey(${pkColumn.javaField}));
-    }
-
-    /**
-     * 新增${functionName}
-     */
-    @PreAuth(hasPerm = "${rootPermission}:${className}:add')")
-    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
-    @PostMapping
-    public ResultEntity<${ClassName}> add(@RequestBody ${ClassName} ${className}) {
-        ${className}Service.insert(${className});
-        return ResultEntity.of(${className});
-    }
-
-    /**
-     * 修改${functionName}
-     */
-    @PreAuth(hasPerm = "${rootPermission}:${className}:edit')")
-    @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public ResultEntity<${ClassName}> edit(@RequestBody ${ClassName} ${className}) {
-        ${className}Service.updateByPrimaryKey(${className});
-        return ResultEntity.of(${className});
-    }
-
-    /**
-     * 删除${functionName}
-     */
-    @PreAuth(hasPerm = "${rootPermission}:${className}:remove')")
-    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{${pkColumn.javaField}s}")
-    public ResultEntity<Integer> remove(@PathVariable List<${pkColumn.javaType}> ${pkColumn.javaField}s) {
-        int re = ${className}Service.deleteByPrimaryKeys(${pkColumn.javaField}s);
-        return ResultEntity.of(re);
-    }
-}
diff --git a/ruoyi-generator/src/test/resources/vm/java/domain.java.vm b/ruoyi-generator/src/test/resources/vm/java/domain.java.vm
deleted file mode 100644
index 1f774cb..0000000
--- a/ruoyi-generator/src/test/resources/vm/java/domain.java.vm
+++ /dev/null
@@ -1,34 +0,0 @@
-package ${fullPackage};
-
-#foreach ($import in $importList)
-import ${import};
-#end
-#if(($table.crud || $table.sub) && $table.audit == 1)
-import ${env.baseAudit};
-#elseif($table.tree)
-import ${env.baseAudit};
-#end
-import lombok.Data;
-/**
- * ${functionName}对象 ${tableName}
- * 
- * @author ${author}
- */
-#if(($table.crud || $table.sub) && $table.audit == 1)
-#set($Entity="BaseAudit")
-#elseif($table.tree)
-#set($Entity="TreeEntity")
-#end
-@Data
-public class ${ClassName}#if($Entity) extends ${Entity}#end {
-    private static final long serialVersionUID = -1L;
-#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
-
-#if($column.columnComment)
-    /** $column.columnComment */
-#end
-    private $column.javaType $column.javaField;
-#end
-#end
-}
diff --git a/ruoyi-generator/src/test/resources/vm/java/dto.java.vm b/ruoyi-generator/src/test/resources/vm/java/dto.java.vm
deleted file mode 100644
index aba8443..0000000
--- a/ruoyi-generator/src/test/resources/vm/java/dto.java.vm
+++ /dev/null
@@ -1,40 +0,0 @@
-package ${fullPackage};
-
-#foreach ($import in $importList)
-import ${import};
-#end
-#if(($table.crud || $table.sub) && $table.audit == 1)
-import ${env.baseAudit};
-#elseif($table.tree)
-import ${env.baseAudit};
-#end
-#if($table.sub)
-import ${packageName}.${javaPath.pojo}.dto.${subClassName}DTO;
-#end
-import lombok.Data;
-/**
- * ${functionName} DTO 对象
- *
- * @author ${author}
- */
-#if(($table.crud || $table.sub) && $table.audit == 1)
-    #set($Entity="BaseAudit")
-#elseif($table.tree)
-    #set($Entity="TreeEntity")
-#end
-@Data
-public class ${ClassName}DTO#if($Entity) extends ${Entity}#end {
-#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
-
-#if($column.columnComment)
-    /** $column.columnComment */
-#end
-    private $column.javaType $column.javaField;
-#end
-#end
-
-#if($table.sub)
-private List<${subClassName}DTO> ${subclassName}List;
-#end
-}
diff --git a/ruoyi-generator/src/test/resources/vm/java/example.java.vm b/ruoyi-generator/src/test/resources/vm/java/example.java.vm
deleted file mode 100644
index a11b49a..0000000
--- a/ruoyi-generator/src/test/resources/vm/java/example.java.vm
+++ /dev/null
@@ -1,302 +0,0 @@
-package ${fullPackage};
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-public class ${ClassName}Example {
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    public ${ClassName}Example() {
-        oredCriteria = new ArrayList<>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        protected void addCriterionForJDBCDate(String condition, Date value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            addCriterion(condition, new java.sql.Date(value.getTime()), property);
-        }
-
-        protected void addCriterionForJDBCDate(String condition, List<Date> values, String property) {
-            if (values == null || values.size() == 0) {
-                throw new RuntimeException("Value list for " + property + " cannot be null or empty");
-            }
-            List<java.sql.Date> dateList = new ArrayList<>();
-            Iterator<Date> iter = values.iterator();
-            while (iter.hasNext()) {
-                dateList.add(new java.sql.Date(iter.next().getTime()));
-            }
-            addCriterion(condition, dateList, property);
-        }
-
-        protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property);
-        }
-#foreach ($column in $columns)
-        public Criteria and${column.capJavaField}IsNull() {
-            addCriterion("${column.columnName} is null");
-            return (Criteria) this;
-        }
-
-        public Criteria and${column.capJavaField}IsNotNull() {
-            addCriterion("${column.columnName} is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria and${column.capJavaField}EqualTo(${column.javaType} value) {
-            addCriterion("${column.columnName} =", value, "${column.javaField}");
-            return (Criteria) this;
-        }
-
-        public Criteria and${column.capJavaField}NotEqualTo(${column.javaType} value) {
-            addCriterion("${column.columnName} <>", value, "${column.javaField}");
-            return (Criteria) this;
-        }
-
-        public Criteria and${column.capJavaField}GreaterThan(${column.javaType} value) {
-            addCriterion("${column.columnName} >", value, "${column.javaField}");
-            return (Criteria) this;
-        }
-
-        public Criteria and${column.capJavaField}GreaterThanOrEqualTo(${column.javaType} value) {
-            addCriterion("${column.columnName} >=", value, "${column.javaField}");
-            return (Criteria) this;
-        }
-
-        public Criteria and${column.capJavaField}LessThan(${column.javaType} value) {
-            addCriterion("${column.columnName} <", value, "${column.javaField}");
-            return (Criteria) this;
-        }
-
-        public Criteria and${column.capJavaField}LessThanOrEqualTo(${column.javaType} value) {
-            addCriterion("${column.columnName} <=", value, "${column.javaField}");
-            return (Criteria) this;
-        }
-#if($column.javaType == 'String')
-
-        public Criteria and${column.capJavaField}Like(${column.javaType} value) {
-            addCriterion("${column.columnName}  like", value, "${column.javaField}");
-            return (Criteria) this;
-        }
-
-        public Criteria and${column.capJavaField}NotLike(${column.javaType} value) {
-            addCriterion("${column.columnName}  not like", value, "${column.javaField}");
-            return (Criteria) this;
-        }
-
-#end
-        public Criteria and${column.capJavaField}In(List<${column.javaType}> values) {
-            addCriterion("${column.columnName} in", values, "${column.javaField}");
-            return (Criteria) this;
-        }
-
-        public Criteria and${column.capJavaField}NotIn(List<${column.javaType}> values) {
-            addCriterion("${column.columnName} not in", values, "${column.javaField}");
-            return (Criteria) this;
-        }
-
-        public Criteria and${column.capJavaField}Between(${column.javaType} value1, ${column.javaType} value2) {
-            addCriterion("${column.columnName} between", value1, value2, "${column.javaField}");
-            return (Criteria) this;
-        }
-
-        public Criteria and${column.capJavaField}NotBetween(${column.javaType} value1, ${column.javaType} value2) {
-            addCriterion("${column.columnName} not between", value1, value2, "${column.javaField}");
-            return (Criteria) this;
-        }
-#end
-    }
-
-    public static class Criteria extends GeneratedCriteria {
-        protected Criteria() {
-            super();
-        }
-    }
-
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}
diff --git a/ruoyi-generator/src/test/resources/vm/java/mapper.java.vm b/ruoyi-generator/src/test/resources/vm/java/mapper.java.vm
deleted file mode 100644
index 1e32b87..0000000
--- a/ruoyi-generator/src/test/resources/vm/java/mapper.java.vm
+++ /dev/null
@@ -1,129 +0,0 @@
-package ${fullPackage};
-
-import java.util.List;
-import ${packageName}.model.entity.${ClassName};
-import ${packageName}.pojo.dao.${ClassName}Example;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * ${functionName}Mapper接口
- * 
- * @author ${author}
- */
-@Mapper
-public interface ${ClassName}Mapper {
-    /**
-     * ${functionName}总数
-     *
-     * @param example 入参
-     * @return 总数
-     */
-    long countByExample(${ClassName}Example example);
-
-    /**
-     * 根据条件批量删除${functionName}
-     *
-     * @param example 入参
-     * @return 结果
-     */
-    int deleteByExample(${ClassName}Example example);
-
-    /**
-     * 根据主键删除${functionName}
-     *
-     * @param ${pkColumn.javaField} 主键
-     * @return 结果
-     */
-    int deleteByPrimaryKey(${pkColumn.javaType} ${pkColumn.javaField});
-
-    /**
-     * 插入${functionName}
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    int insert(${ClassName} ${className});
-
-    /**
-     * 插入或更新${functionName}
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    int insertOrUpdate(${ClassName} ${className});
-
-    /**
-     * 插入或更新${functionName}非空属性
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    int insertOrUpdateSelective(${ClassName} ${className});
-
-    /**
-     * 插入${functionName}非空属性
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    int insertSelective(${ClassName} ${className});
-
-    /**
-     * 批量插入${functionName}
-     *
-     * @param list ${functionName}列表
-     * @return 结果
-     */
-    int batchInsert(@Param("list") List<${ClassName}> list);
-
-    /**
-     * 根据条件查询${functionName}
-     *
-     * @param example 条件
-     * @return 列表
-     */
-    List<${ClassName}> selectByExample(${ClassName}Example example);
-
-    /**
-     * 根据主键查询${functionName}
-     *
-     * @param ${pkColumn.javaField} 主键
-     * @return ${functionName}
-     */
-    ${ClassName} selectByPrimaryKey(${pkColumn.javaType} ${pkColumn.javaField});
-
-    /**
-     * 根据条件批量更新${functionName}, 过滤非空属性
-     *
-     * @param ${className} 更新内容
-     * @param example 条件
-     * @return 结果
-     */
-    int updateByExampleSelective(@Param("record") ${ClassName} ${className}, @Param("example") ${ClassName}Example example);
-
-    /**
-     * 根据条件批量更新${functionName}
-     *
-     * @param ${className} 更新内容
-     * @param example 条件
-     * @return 结果
-     */
-    int updateByExample(@Param("record") ${ClassName} ${className}, @Param("example") ${ClassName}Example example);
-
-    /**
-     * 根据主键更新${functionName}
-     *
-     * @param ${className} 更新内容
-     * @return 结果
-     */
-    int updateByPrimaryKeySelective(${ClassName} ${className});
-
-    /**
-     * 根据主键更新${functionName}
-     *
-     * @param ${className} 更新内容
-     * @return 结果
-     */
-    int updateByPrimaryKey(${ClassName} ${className});
-}
diff --git a/ruoyi-generator/src/test/resources/vm/java/query.java.vm b/ruoyi-generator/src/test/resources/vm/java/query.java.vm
deleted file mode 100644
index 8445121..0000000
--- a/ruoyi-generator/src/test/resources/vm/java/query.java.vm
+++ /dev/null
@@ -1,9 +0,0 @@
-package ${fullPackage};
-
-/**
- * ${functionName} 查询 对象
- *
- * @author ${author}
- */
-public class ${ClassName}Query {
-}
diff --git a/ruoyi-generator/src/test/resources/vm/java/service.java.vm b/ruoyi-generator/src/test/resources/vm/java/service.java.vm
deleted file mode 100644
index b0b4563..0000000
--- a/ruoyi-generator/src/test/resources/vm/java/service.java.vm
+++ /dev/null
@@ -1,117 +0,0 @@
-package ${fullPackage};
-
-import java.util.List;
-import ${packageName}.model.entity.${ClassName};
-import ${packageName}.pojo.query.${ClassName}Query;
-import com.bryx.core.common.base.entity.IPageable;
-
-/**
- * ${functionName}Service接口
- * 
- * @author ${author}
- */
-public interface I${ClassName}Service {
-    /**
-     * 删除 ${functionName}
-     *
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return 结果
-     */
-    int deleteByPrimaryKey(${pkColumn.javaType} ${pkColumn.javaField});
-
-    /**
-     * 根据主键，批量删除 ${functionName}
-     *
-     * @param ${pkColumn.javaField}s ${functionName}主键列表
-     * @return 结果
-     */
-    int deleteByPrimaryKeys(List<${pkColumn.javaType}> ${pkColumn.javaField}s);
-
-    /**
-     * 新增${functionName}
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    int insert(${ClassName} ${className});
-
-    /**
-     * 新增 或 修改 ${functionName}
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    int insertOrUpdate(${ClassName} ${className});
-
-    /**
-     * 新增 或 修改 ${functionName}, 非空字段
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    int insertOrUpdateSelective(${ClassName} ${className});
-
-    /**
-     * 新增${functionName}, 非空字段
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    int insertSelective(${ClassName} ${className});
-
-    /**
-     * 根据主键，查询 ${functionName}
-     *
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return ${functionName}
-     */
-     ${ClassName} selectByPrimaryKey(${pkColumn.javaType} ${pkColumn.javaField});
-
-     /**
-     * 根据条件，查询 ${functionName}
-     *
-     * @param query ${functionName}条件
-     * @return ${functionName}
-     */
-     List<${ClassName}> selectByCondition(${ClassName}Query query);
-
-     /**
-     * 根据条件，分页查询 ${functionName}
-     *
-     * @param query ${functionName}条件
-     * @return ${functionName}
-     */
-     List<${ClassName}> selectByCondition(${ClassName}Query query, IPageable page);
-
-    /**
-     * 根据主键修改${functionName}，过滤非空
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    int updateByPrimaryKeySelective(${ClassName} ${className});
-
-    /**
-     * 根据主键修改${functionName}
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    int updateByPrimaryKey(${ClassName} ${className});
-
-    /**
-     * 根据主键批量修改${functionName}
-     *
-     * @param list ${functionName}列表
-     * @return 结果
-     */
-    int updateBatch(List<${ClassName}> list);
-
-    /**
-     * 批量插入${functionName}
-     *
-     * @param list ${functionName}列表
-     * @return 结果
-     */
-    int batchInsert(List<${ClassName}> list);
-}
diff --git a/ruoyi-generator/src/test/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/test/resources/vm/java/serviceImpl.java.vm
deleted file mode 100644
index 2094308..0000000
--- a/ruoyi-generator/src/test/resources/vm/java/serviceImpl.java.vm
+++ /dev/null
@@ -1,103 +0,0 @@
-package ${fullPackage};
-
-import java.util.List;
-#if($table.hasDate())
-#foreach($date in $table.dateImports())
-import $date;
-#end
-#end
-import com.bryx.core.common.base.entity.IPageable;
-import com.github.pagehelper.PageHelper;
-import java.util.ArrayList;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import lombok.extern.slf4j.Slf4j;
-import ${packageName}.mapper.${ClassName}Mapper;
-import ${packageName}.model.entity.${ClassName};
-import ${packageName}.pojo.query.${ClassName}Query;
-import ${packageName}.pojo.dao.${ClassName}Example;
-import ${packageName}.service.I${ClassName}Service;
-
-/**
- * ${functionName}Service业务层处理
- *
- * @author ${author}
- */
-@Service
-@Slf4j
-public class ${ClassName}ServiceImpl implements I${ClassName}Service {
-    @Autowired
-    private ${ClassName}Mapper ${className}Mapper;
-
-
-    @Override
-    public int deleteByPrimaryKey(${pkColumn.javaType} ${pkColumn.javaField}) {
-        return ${className}Mapper.deleteByPrimaryKey(${pkColumn.javaField});
-    }
-
-    @Override
-    public int insert(${ClassName} ${className}) {
-        return ${className}Mapper.insert(${className});
-    }
-
-    @Override
-    public int insertOrUpdate(${ClassName} ${className}) {
-        return ${className}Mapper.insertOrUpdate(${className});
-    }
-
-    @Override
-    public int insertOrUpdateSelective(${ClassName} ${className}) {
-        return ${className}Mapper.insertOrUpdateSelective(${className});
-    }
-
-    @Override
-    public int insertSelective(${ClassName} ${className}) {
-        return ${className}Mapper.insertSelective(${className});
-    }
-
-    @Override
-    public ${ClassName} selectByPrimaryKey(${pkColumn.javaType} ${pkColumn.javaField}) {
-        return ${className}Mapper.selectByPrimaryKey(${pkColumn.javaField});
-    }
-
-    @Override
-    public int updateByPrimaryKeySelective(${ClassName} ${className}) {
-        return ${className}Mapper.updateByPrimaryKeySelective(${className});
-    }
-
-    @Override
-    public int updateByPrimaryKey(${ClassName} ${className}) {
-        return ${className}Mapper.updateByPrimaryKey(${className});
-    }
-
-    @Override
-    public int updateBatch(List<${ClassName}> list) {
-        return ${className}Mapper.batchInsert(list);
-    }
-
-    @Override
-    public int batchInsert(List<${ClassName}> list) {
-        return ${className}Mapper.batchInsert(list);
-    }
-
-    @Override
-    public List<${ClassName}> selectByCondition(${ClassName}Query ${className}) {
-        ${ClassName}Example example = new ${ClassName}Example();
-        return ${className}Mapper.selectByExample(example);
-    }
-
-    @Override
-    public List<${ClassName}> selectByCondition(${ClassName}Query ${className}Query, IPageable pageable) {
-        PageHelper.startPage(pageable.getPage(), pageable.getPageSize());
-        ${ClassName}Example example = new ${ClassName}Example();
-        return ${className}Mapper.selectByExample(example);
-    }
-
-    @Override
-    public int deleteByPrimaryKeys(List<Long> ids) {
-        ${ClassName}Example example = new ${ClassName}Example();
-        example.createCriteria().andIdIn(ids);
-        return ${className}Mapper.deleteByExample(example);
-    }
-}
diff --git a/ruoyi-generator/src/test/resources/vm/java/vo.java.vm b/ruoyi-generator/src/test/resources/vm/java/vo.java.vm
deleted file mode 100644
index 9341e8e..0000000
--- a/ruoyi-generator/src/test/resources/vm/java/vo.java.vm
+++ /dev/null
@@ -1,36 +0,0 @@
-package ${fullPackage};
-
-#foreach ($import in $importList)
-import ${import};
-#end
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-#if(${table.audit} == 1)
-import ${env.baseAudit};
-#end
-#if($table.sub)
-import ${packageName}.${javaPath.pojo}.dto.${subClassName}DTO;
-#end
-import lombok.Data;
-/**
- * ${functionName} 数据视图对象
- * 
- * @author ${author}
- */
-@Data
-public class ${ClassName}VO #if(${table.audit} == 1)extends BaseAudit#end {
-#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
-#if($column.isDate())
-    @JsonFormat(pattern = "${column.dateFormat}")
-    @Excel(name = "${column.genLabel()}", width = 30, dateFormat = "${column.dateFormat}")
-#else
-    @Excel(name = "${column.genLabel()}")
-#end
-    private $column.javaType $column.javaField;
-#end
-#end
-#if($table.sub)
-    private List<${subClassName}DTO> ${subclassName}List;
-#end
-}
diff --git a/ruoyi-generator/src/test/resources/vm/js/api.js.vm b/ruoyi-generator/src/test/resources/vm/js/api.js.vm
deleted file mode 100644
index c99a370..0000000
--- a/ruoyi-generator/src/test/resources/vm/js/api.js.vm
+++ /dev/null
@@ -1,55 +0,0 @@
-import request from '@/utils/request'
-
-export function query${ClassName}Page (params) {
-  return request({
-    url: `/emergencyhandle-service/emergencyhandle/${className}/list`,
-    method: 'get',
-    params
-  })
-}
-export function query${ClassName}ById (id) {
-  return request({
-    url: `/emergencyhandle-service/emergencyhandle/${className}/` + id,
-    method: 'get'
-  })
-}
-export function add${ClassName} (data) {
-  return request({
-    url: `/emergencyhandle-service/emergencyhandle/${className}`,
-    method: 'post',
-    data
-  })
-}
-export function update${ClassName} (data) {
-  return request({
-    url: `/emergencyhandle-service/emergencyhandle/${className}`,
-    method: 'put',
-    data
-  })
-}
-export function delete${ClassName} (ids) {
-  return request({
-    url: `/emergencyhandle-service/emergencyhandle/${className}/` + ids.join(','),
-    method: 'delete'
-  })
-}
-export function export${ClassName} (params) {
-  return request({
-    url: `/emergencyhandle-service/emergencyhandle/${className}/export`,
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
-export function import${ClassName} (file) {
-  const formData = new FormData()
-  formData.append('file', file)
-  return request({
-    url: `/emergencyhandle-service/emergencyhandle/${className}/importData`,
-    method: 'post',
-    data: formData,
-    headers: {
-      'Content-Type': 'multipart/form-data'
-    }
-  })
-}
diff --git a/ruoyi-generator/src/test/resources/vm/vue/add.vue.vm b/ruoyi-generator/src/test/resources/vm/vue/add.vue.vm
deleted file mode 100644
index 9faa65d..0000000
--- a/ruoyi-generator/src/test/resources/vm/vue/add.vue.vm
+++ /dev/null
@@ -1,64 +0,0 @@
-<template lang="pug">
-  .add_${className}_wrapper
-    a-form
-#foreach($column in $columns)
-#if($column.edit)
-      a-form-item(label="${column.genLabel()}")
-        ${column.genComponent()}(v-model="form.${column.javaField}")
-#end
-#end
-    a-button.mt16(type="primary" @click="add${ClassName}Click") 保存
-</template>
-
-<script>
-import { add${ClassName}, query${ClassName}ById, update${ClassName} } from '@api/emergencyhandle/${className}'
-import events from '@comp/MultiTab/events'
-
-export default {
-  name: 'Add',
-  data () {
-    return {
-      form: {
-#foreach($column in $columns)
-#if($column.edit)
-        ${column.javaField}: null,
-#end
-#end
-      }
-    }
-  },
-  created () {
-    const { id } = this.$route.query
-    if (id) {
-      this.init${ClassName}(id)
-    }
-  },
-  methods: {
-    add${ClassName}Click () {
-      const call = this.form.id ? update${ClassName} : add${ClassName};
-      call({ ...this.form }).then(res => {
-        this.$message.success('创建成功')
-        events.$emit('close')
-      })
-    },
-    init${ClassName} (id) {
-      query${ClassName}ById(id).then(res => {
-        this.form = res.data
-      })
-    }
-  }
-}
-</script>
-
-<style lang="stylus">
-.add_${className}_wrapper
-  .ant-form
-    padding 1rem 0 0 1rem
-    background-color white
-    display flex
-    flex-wrap wrap
-
-    .ant-form-item
-      width calc(50% - 1rem)
-      margin-right 1rem
-</style>
diff --git a/ruoyi-generator/src/test/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/test/resources/vm/vue/index.vue.vm
deleted file mode 100644
index e337fd8..0000000
--- a/ruoyi-generator/src/test/resources/vm/vue/index.vue.vm
+++ /dev/null
@@ -1,165 +0,0 @@
-<template lang="pug">
-  .${className}_wrapper.base_query_page
-    .conds
-      a-form.flex_center(:label-col="{ span: 8 }" :wrapper-col="{ span: 16 }")
-#foreach($column in $columns)
-#if($column.query)
-        a-form-item(label="${column.genLabel()}")
-          ${column.genComponent()}
-#end
-#end
-      div.tr
-        a-button(type="primary" @click="loadAll") 查询
-    .body.mt16
-      .ops.flex_center
-        .flex_one
-          | ${functionName}管理
-        .btns
-          a-button(type="primary" @click="add${ClassName}Click()") 新增
-          a-button(@click="importByExcel") 批量导入
-          a-button(@click="exportByExcel") 导出
-      .list
-        a-table(:columns="columns" :data-source="list" rowKey="id" :pagination="false")
-         span(slot="index"  slot-scope="text, record, index") {{index + 1}}
-         span(slot="action" slot-scope="text, record")
-           a(@click="add${ClassName}Click(record.id)") 编辑
-           a-divider(type="vertical")
-           a(@click="deleteClick(record)") 删除
-      .pagination
-        a-pagination(v-model="pageReq.page"
-          :total="total"
-          :pageSize="pageReq.pageSize"
-          show-less-items
-          @change="changePage"
-          @showSizeChange="changePageSize"
-          )
-    a-modal(title="导入${functionName}"
-      :visible="importVisible"
-      okText="确认上传"
-      @ok="handleOk"
-      @cancel="importVisible = false")
-      a-upload(
-        name="file"
-        :multiple="false"
-        :customRequest="uploadFile"
-        :fileList="fileList"
-        :remove="removeFile"
-        )
-        a-button(v-if="fileList.length < 1")
-          a-icon(type="upload")
-          span 选择文件
-      .tr
-        a(@click="") 下载模板文件
-</template>
-
-<script>
-import { export${ClassName}, import${ClassName}, query${ClassName}Page, delete${ClassName} } from '@api/emergencyhandle/${className}'
-
-export default {
-  name: 'Index',
-  data () {
-    return {
-      cond: {},
-      columns: [
-        { title: '序号', scopedSlots: { customRender: 'index' } },
-#foreach($column in $columns)
-#if($column.query)
-        { title: '${column.genLabel()}', dataIndex: '${column.javaField}', key: '${column.javaField}' },
-#end
-#end
-        { title: '操作', scopedSlots: { customRender: 'action' } }
-      ],
-      list: [],
-      pageReq: {
-        page: 1,
-        pageSize: 20
-      },
-      total: 0,
-      importVisible: false,
-      fileList: []
-    }
-  },
-  created () {
-    this.loadAll()
-  },
-  methods: {
-    loadAll () {
-      query${ClassName}Page({ ...this.cond, ...this.pageReq }).then(res => {
-        const { total, list } = res.data
-        this.list = list
-        this.total = total
-      })
-    },
-    add${ClassName}Click (id) {
-      const obj = { path: '/${className}/edit', query: { id }};
-      this.$router.push(obj)
-    },
-    changePage (page) {
-      this.pageReq.page = page
-      this.loadAll()
-    },
-    changePageSize (size) {
-      this.pageReq.pageSize = size
-      this.pageReq.page = 1
-      this.loadAll()
-    },
-    exportByExcel () {
-      export${ClassName}()
-        .then(resp => {
-          const blob = resp.data
-          const url = window.URL.createObjectURL(blob)
-          const a = document.createElement('a')
-          a.style.display = 'none'
-          a.href = url
-          // the filename you want
-          a.download = '${functionName}.xlsx'
-          document.body.appendChild(a)
-          a.click()
-          window.URL.revokeObjectURL(url)
-          this.$message.success('导入成功！')
-        })
-        .catch(() => this.$message.error('导入失败！'))
-    },
-    importByExcel () {
-      this.importVisible = true
-      this.fileList = []
-    },
-    uploadFile (uploadObj) {
-      this.fileList.push(uploadObj.file)
-    },
-    removeFile (file) {
-      const index = this.fileList.findIndex(v => v === file)
-      this.fileList.splice(index, 1)
-    },
-    handleOk () {
-      if (this.fileList.length === 0) {
-        this.importVisible = false
-        return
-      }
-      import${ClassName}(this.fileList[0]).then(res => {
-        console.log(res)
-        this.loadAll()
-      }).finally(() => {
-        this.importVisible = false
-      })
-    },
-    deleteClick (row) {
-      this.$confirm({
-        title: '删除确认',
-        content: '确认删除 ' + row.userName + ' ?',
-        onOk: () => {
-          delete${ClassName}([row.id]).then(res => {
-            this.$message.success('删除成功！')
-            this.loadAll()
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="stylus">
-.${className}_wrapper
-  padding 0
-</style>
diff --git a/ruoyi-generator/src/test/resources/vm/xml/mapper.xml.vm b/ruoyi-generator/src/test/resources/vm/xml/mapper.xml.vm
deleted file mode 100644
index 3d1faed..0000000
--- a/ruoyi-generator/src/test/resources/vm/xml/mapper.xml.vm
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="${packageName}.mapper.${ClassName}Mapper">
-    <resultMap id="${ClassName}Result" type="${packageName}.model.entity.${ClassName}">
-#foreach ($column in $columns)
-        <result property="${column.javaField}" column="${column.columnName}"/>
-#end
-    </resultMap>
-    <sql id="Base_Column_List">
-        #foreach($column in $columns) $column.columnName#if($velocityCount != $columns.size()), #end#end
-
-    </sql>
-    <sql id="Base_Column_List_No_Pk">
-        #foreach($column in $columns)#if($column.javaField != $pkColumn.javaField)${column.columnName}#if($velocityCount != $columns.size()), #end#end#end
-
-    </sql>
-    <sql id="Example_Where_Clause">
-        <where>
-            <foreach collection="oredCriteria" item="criteria" separator="or">
-                <if test="criteria.valid">
-                    <trim prefix="(" prefixOverrides="and" suffix=")">
-                        <foreach collection="criteria.criteria" item="criterion">
-                            <choose>
-                                <when test="criterion.noValue">
-                                    and ${criterion.condition}
-                                </when>
-                                <when test="criterion.singleValue">
-                                    and ${criterion.condition} #{criterion.value}
-                                </when>
-                                <when test="criterion.betweenValue">
-                                    and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                                </when>
-                                <when test="criterion.listValue">
-                                    and ${criterion.condition}
-                                    <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                                        #{listItem}
-                                    </foreach>
-                                </when>
-                            </choose>
-                        </foreach>
-                    </trim>
-                </if>
-            </foreach>
-        </where>
-    </sql>
-    <sql id="Update_By_Example_Where_Clause">
-        <where>
-            <foreach collection="example.oredCriteria" item="criteria" separator="or">
-                <if test="criteria.valid">
-                    <trim prefix="(" prefixOverrides="and" suffix=")">
-                        <foreach collection="criteria.criteria" item="criterion">
-                            <choose>
-                                <when test="criterion.noValue">
-                                    and ${criterion.condition}
-                                </when>
-                                <when test="criterion.singleValue">
-                                    and ${criterion.condition} #{criterion.value}
-                                </when>
-                                <when test="criterion.betweenValue">
-                                    and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                                </when>
-                                <when test="criterion.listValue">
-                                    and ${criterion.condition}
-                                    <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                                        #{listItem}
-                                    </foreach>
-                                </when>
-                            </choose>
-                        </foreach>
-                    </trim>
-                </if>
-            </foreach>
-        </where>
-    </sql>
-    <select id="countByExample" parameterType="${packageName}.pojo.dao.${ClassName}Example" resultType="java.lang.Long">
-        select count(*) from ${tableName}
-        <if test="_parameter != null">
-            <include refid="Example_Where_Clause" />
-        </if>
-    </select>
-    <delete id="deleteByExample" parameterType="${packageName}.pojo.dao.${ClassName}Example">
-        delete from ${tableName}
-        <if test="_parameter != null">
-            <include refid="Example_Where_Clause" />
-        </if>
-    </delete>
-    <select id="selectByExample" parameterType="${packageName}.pojo.dao.${ClassName}Example" resultMap="${ClassName}Result">
-        select
-        <if test="distinct">
-            distinct
-        </if>
-        <include refid="Base_Column_List" />
-        from ${tableName}
-        <if test="_parameter != null">
-            <include refid="Example_Where_Clause" />
-        </if>
-        <if test="orderByClause != null">
-            order by ${orderByClause}
-        </if>
-    </select>
-    <select id="selectByPrimaryKey" parameterType="${pkColumn.javaType}" resultMap="${ClassName}Result">
-        select
-        <include refid="Base_Column_List" />
-        from ${tableName}
-        where ${pkColumn.columnName} = #{${pkColumn.javaField}, jdbcType=$pkColumn.CapColumnType}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="${pkColumn.javaType}">
-        delete from ${tableName}
-        where ${pkColumn.columnName} = #{${pkColumn.javaField}, jdbcType=$pkColumn.CapColumnType}
-    </delete>
-    <insert id="insert" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
-        insert into ${tableName}
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            #foreach($column in $columns)$column.columnName, #end
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            #foreach($column in $columns)#{$column.javaField}, #end
-        </trim>
-    </insert>
-    <insert id="insertSelective" keyColumn="$pkColumn.columnName" keyProperty="$pkColumn.javaField" parameterType="${ClassName}" useGeneratedKeys="true">
-        insert into ${tableName}
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName,</if>
-#end
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-                <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">#{$column.javaField},</if>
-#end
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="${ClassName}">
-        update ${tableName}
-        <set>
-#foreach($column in $columns)
-#if($column.javaField != $pkColumn.javaField)
-            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">
-                $column.columnName = #{$column.javaField, jdbcType=$pkColumn.CapColumnType},
-            </if>
-#end
-#end
-        </set>
-        where ${pkColumn.columnName} = #{${pkColumn.javaField}, jdbcType=$pkColumn.CapColumnType}
-    </update>
-    <update id="updateByPrimaryKey" parameterType="${ClassName}">
-        update ${tableName}
-        <trim prefix="set " suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.javaField != $pkColumn.javaField)
-            $column.columnName = #{$column.javaField, jdbcType=$column.CapColumnType},
-#end
-#end
-        </trim>
-        where ${pkColumn.columnName} = #{${pkColumn.javaField}, jdbcType=$pkColumn.CapColumnType}
-    </update>
-    <update id="updateBatch" parameterType="java.util.List">
-        update ${tableName}
-        <trim prefix="set" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.javaField != $pkColumn.javaField)
-            <trim prefix="$pkColumn.columnName = case" suffix="end,">
-                <foreach collection="list" index="index" item="item">
-                    when ${pkColumn.columnName} = #{item.${pkColumn.javaField},jdbcType=$pkColumn.CapColumnType} then #{item.${column.javaField}, jdbcType=$column.CapColumnType}
-                </foreach>
-            </trim>
-#end
-#end
-        </trim>
-        where ${pkColumn.columnName} in
-        <foreach close=")" collection="list" item="item" open="(" separator=", ">
-            #{item.$pkColumn.javaField,jdbcType=$pkColumn.CapColumnType}
-        </foreach>
-    </update>
-    <update id="updateBatchSelective" parameterType="java.util.List">
-        update ${tableName}
-        <trim prefix="set" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.javaField != $pkColumn.javaField)
-            <trim prefix="$pkColumn.columnName = case" suffix="end,">
-                <foreach collection="list" index="index" item="item">
-                    <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">
-                        when ${pkColumn.columnName} = #{item.${pkColumn.javaField},jdbcType=$pkColumn.CapColumnType} then #{item.${column.javaField}, jdbcType=$column.CapColumnType}
-                    </if>
-                </foreach>
-            </trim>
-#end
-#end
-        </trim>
-        where ${pkColumn.columnName} in
-        <foreach close=")" collection="list" item="item" open="(" separator=", ">
-            #{item.$pkColumn.javaField,jdbcType=$pkColumn.CapColumnType}
-        </foreach>
-    </update>
-    <update id="updateByExampleSelective" parameterType="map">
-        update ${tableName}
-        <set>
-#foreach($column in $columns)
-#if($column.javaField != $pkColumn.javaField)
-            <if test="record.$column.javaField != null">
-                $column.columnName = #{record.$column.javaField, jdbcType=$pkColumn.CapColumnType},
-            </if>
-#end
-#end
-        </set>
-        <if test="_parameter != null">
-            <include refid="Update_By_Example_Where_Clause" />
-        </if>
-    </update>
-    <update id="updateByExample" parameterType="map">
-        update ${tableName}
-        set
-#foreach($column in $columns)
-#if($column.javaField != $pkColumn.javaField)
-        $column.columnName = #{record.$column.javaField, jdbcType=$pkColumn.CapColumnType},
-#end
-#end
-        <if test="_parameter != null">
-            <include refid="Update_By_Example_Where_Clause" />
-        </if>
-    </update>
-    <insert id="batchInsert" keyColumn="$pkColumn.columnName" keyProperty="$pkColumn.javaField" parameterType="map" useGeneratedKeys="true">
-        insert into ${tableName}
-        (<include refid="Base_Column_List_No_Pk" />)
-        values
-        <foreach collection="list" item="item" separator=",">
-            <trim prefix="(" suffix=")" suffixOverrides=",">
-                #foreach($column in $columns)#if($column.javaField != $pkColumn.javaField)#{item.$column.javaField, jdbcType=$column.CapColumnType}, #end#end
-            </trim>
-        </foreach>
-    </insert>
-    <insert id="insertOrUpdate" keyColumn="$pkColumn.columnName" keyProperty="$pkColumn.javaField" parameterType="${ClassName}" useGeneratedKeys="true">
-        insert into ${tableName}
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="$pkColumn.javaField != null">
-                $pkColumn.columnName,
-            </if>
-            <include refid="Base_Column_List_No_Pk" />
-        </trim>
-        values
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="$pkColumn.javaField != null">
-                #{$pkColumn.javaField,jdbcType=$pkColumn.CapColumnType},
-            </if>
-#foreach($column in $columns)
-#if($column.javaField != $pkColumn.javaField)
-            #{$column.javaField, jdbcType=$column.CapColumnType},
-#end
-#end
-        </trim>
-        <if test="$pkColumn.javaField != null">        
-        on duplicate key update
-        <trim suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.javaField != $pkColumn.javaField)
-            $column.columnName = #{$column.javaField, jdbcType=$column.CapColumnType},
-#end
-#end
-        </trim>
-        </if>
-    </insert>
-    <insert id="insertOrUpdateSelective" keyColumn="$pkColumn.columnName" keyProperty="$pkColumn.javaField" parameterType="${ClassName}" useGeneratedKeys="true">
-        insert into ${tableName}
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-            <if test="$column.javaField != null">
-                $column.columnName,
-            </if>
-#end
-        </trim>
-        values
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-            <if test="$column.javaField != null">
-                #{$column.javaField,jdbcType=$column.CapColumnType},
-            </if>
-#end
-        </trim>
-        on duplicate key update
-        <trim suffixOverrides=",">
-#foreach($column in $columns)
-            <if test="$column.javaField != null">
-                $column.columnName = #{$column.javaField, jdbcType=$column.CapColumnType},
-            </if>
-#end
-        </trim>
-    </insert>
-</mapper>
diff --git a/ruoyi-generator/src/test/resources/vm_qianshao/js/api.js.vm b/ruoyi-generator/src/test/resources/vm_qianshao/js/api.js.vm
deleted file mode 100644
index eca58da..0000000
--- a/ruoyi-generator/src/test/resources/vm_qianshao/js/api.js.vm
+++ /dev/null
@@ -1,54 +0,0 @@
-import request from '@/utils/request'
-
-// 查询${functionName}列表
-export function list${ClassName}(data, query) {
-  return request({
-    url: '/${moduleName}/${className}/list',
-    method: 'post',
-    data,
-    params: query
-  })
-}
-
-// 查询${functionName}详细
-export function get${ClassName}(${pkColumn.javaField}) {
-  return request({
-    url: '/${moduleName}/${className}/' + ${pkColumn.javaField},
-    method: 'get'
-  })
-}
-
-// 新增${functionName}
-export function add${ClassName}(data) {
-  return request({
-    url: '/${moduleName}/${className}',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改${functionName}
-export function update${ClassName}(data) {
-  return request({
-    url: '/${moduleName}/${className}',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除${functionName}
-export function del${ClassName}(${pkColumn.javaField}) {
-  return request({
-    url: '/${moduleName}/${className}/' + ${pkColumn.javaField},
-    method: 'delete'
-  })
-}
-
-// 导出${functionName}
-export function export${ClassName}(query) {
-  return request({
-    url: '/${moduleName}/${className}/export',
-    method: 'get',
-    params: query
-  })
-}
diff --git a/ruoyi-generator/src/test/resources/vm_qianshao/vue/add.vue.vm b/ruoyi-generator/src/test/resources/vm_qianshao/vue/add.vue.vm
deleted file mode 100644
index 16e91d6..0000000
--- a/ruoyi-generator/src/test/resources/vm_qianshao/vue/add.vue.vm
+++ /dev/null
@@ -1,62 +0,0 @@
-<template lang="pug">
-  .add_${className}_wrapper
-    el-form
-#foreach($column in $columns)
-#if($column.edit)
-      el-form-item(label="${column.genLabel()}")
-        ${column.genComponent()}(v-model="form.${column.javaField}")
-#end
-#end
-    el-button.mt16(type="primary" @click="add${ClassName}Click") 保存
-</template>
-
-<script>
-import { add${ClassName}, get${ClassName}, update${ClassName} } from '@/api/${moduleName}/${className}'
-
-export default {
-  name: 'Add',
-  data () {
-    return {
-      form: {
-#foreach($column in $columns)
-#if($column.edit)
-        ${column.javaField}: null,
-#end
-#end
-      }
-    }
-  },
-  created () {
-    const { id } = this.$route.query
-    if (id) {
-      this.init${ClassName}(id)
-    }
-  },
-  methods: {
-    add${ClassName}Click () {
-      const call = this.form.id ? update${ClassName} : add${ClassName};
-      call({ ...this.form }).then(res => {
-        this.$message.success('创建成功')
-      })
-    },
-    init${ClassName} (id) {
-      get${ClassName}(id).then(res => {
-        this.form = res.data
-      })
-    }
-  }
-}
-</script>
-
-<style lang="stylus">
-.add_${className}_wrapper
-  .ant-form
-    padding 1rem 0 0 1rem
-    background-color white
-    display flex
-    flex-wrap wrap
-
-    .ant-form-item
-      width calc(50% - 1rem)
-      margin-right 1rem
-</style>
diff --git a/ruoyi-generator/src/test/resources/vm_qianshao/vue/index.vue.vm b/ruoyi-generator/src/test/resources/vm_qianshao/vue/index.vue.vm
deleted file mode 100644
index 4580187..0000000
--- a/ruoyi-generator/src/test/resources/vm_qianshao/vue/index.vue.vm
+++ /dev/null
@@ -1,543 +0,0 @@
-<template lang="pug">
-  .app-container.common_view
-    el-form.ry_form(:model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form")
-#set($count = 0)
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input")
-      el-form-item(label="${comment}" prop="${column.javaField}")
-        el-input(
-        v-model="queryParams.${column.javaField}"
-        placeholder="请输入${comment}"
-        clearable
-        size="small"
-        @keyup.enter.native="handleQuery")
-#elseif($column.htmlType == "select" || $column.htmlType == "radio")
-      el-form-item(label="${comment}" prop="${column.javaField}")
-        el-select(v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small")
-#if("" != $dictType)
-          el-option(
-            v-for="dict in dict.type.${dictType}"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value")
-#elseif($dictType)
-          el-option(label="请选择字典生成" value="")
-#end
-#elseif($column.htmlType == "datetime" || $column.htmlType == "date")
-#set($valueFormat = 'yyyy-MM-dd HH:mm:ss')
-#if($column.htmlType == "date")
-#set($valueFormat = 'yyyy-MM-dd')
-#end
-#if($column.queryType != "BETWEEN")
-      el-form-item(label="${comment}" prop="${column.javaField}")
-        el-date-picker(
-          clearable
-          size="small"
-          v-model="queryParams.${column.javaField}"
-          type="datetime"
-          value-format="$valueFormat"
-          placeholder="选择${comment}")
-#else
-      el-form-item(label="${comment}")
-        el-date-picker(
-          v-model="daterange${AttrName}"
-          size="small"
-          style="width: 240px"
-          value-format="$valueFormat"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期")
-#end
-#elseif($column.htmlType == "time")
-      el-form-item(label="${comment}")
-        el-time-picker(
-          #if($column.queryType == "BETWEEN")is-range#end
-          v-model="queryParams.${column.javaField}"
-          range-separator="-"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
-          placeholder="选择时间范围")
-#end
-#set($count = $count + 1)
-#end
-#end
-      el-form-item(class="flex_one tr")
-        el-button(type="primary" icon="el-icon-search" size="mini" @click="handleQuery") 搜索
-        el-button(icon="el-icon-refresh" size="mini" @click="resetQuery") 重置
-    .ops.flex_space
-      .h1 ${functionName}
-      .ops
-        el-button(
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['${moduleName}:${businessName}:add']"
-          ) 新增
-    el-table.body_table(v-loading="loading" :data="${businessName}List")
-      el-table-column(type="index" width="55" align="center" label="序号")
-#set($count0 = 0)
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
-      el-table-column(label="${comment}" align="center" prop="${javaField}")
-#elseif($column.list)
-#if($column.htmlType == "datetime" || $column.htmlType == "date" || $column.htmlType == "time")
-#set($valueFormat = '')
-#if($column.htmlType == "date")
-#set($valueFormat = '{y}-{m}-{d}')
-#elseif($column.htmlType == "time")
-#set($valueFormat = '{h}:{i}:{s}')
-#end
-      el-table-column(label="${comment}" align="center" prop="${javaField}" width="180")
-        template(slot-scope="scope")
-            span {{ parseTime(scope.row.${javaField}, '$valueFormat')}}
-#elseif("" != $column.dictType)
-      el-table-column(label="${comment}" align="center" prop="${javaField}")
-        template(slot-scope="scope")
-          dict-tag(:options="dict.type.${column.dictType}" :value="scope.row.${javaField}")
-#elseif("" != $javaField)
-      el-table-column(label="${comment}" align="center" prop="${javaField}")
-#end
-#set($count0 = $count0 + 1)
-#end
-#end
-      el-table-column(label="操作" align="center" class-name="small-padding fixed-width")
-        template(slot-scope="scope")
-          el-button(
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['${moduleName}:${businessName}:edit']"
-          ) 修改
-          el-button(
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['${moduleName}:${businessName}:remove']"
-          ) 删除
-    pagination.body_page(
-      v-show="total>0"
-      :total="total"
-      :page.sync="pageReq.page"
-      :limit.sync="pageReq.size"
-      @pagination="getList")
-
-    <!-- 添加或修改${functionName}对话框 -->
-    el-dialog(:title="title" :visible.sync="open" width="50%" append-to-body)
-      el-form(ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two")
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$column.pk && $column.htmlType != "editor" && (!$table.hasPct() || !$column.isPct()))
-#if(($column.usableColumn) || (!$column.superColumn))
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if($column.htmlType == "input")
-        el-form-item(label="${comment}" prop="${field}")
-          el-input(v-model="form.${field}" placeholder="请输入${comment}")
-#elseif($column.htmlType == "imageUpload")
-        el-form-item(label="${comment}")
-          imageUpload(v-model="form.${field}")
-#elseif($column.htmlType == "fileUpload")
-        el-form-item(label="${comment}")
-          fileUpload(v-model="form.${field}")
-#elseif($column.htmlType == "select" && "" != $dictType)
-        el-form-item(label="${comment}" prop="${field}")
-          el-select(v-model="form.${field}" placeholder="请选择${comment}")
-            el-option(
-              v-for="dict in dict.type.${dictType}"
-              :key="dict.value"
-              :label="dict.label"
-              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
-           )
-#elseif($column.htmlType == "select" && $dictType)
-        el-form-item(label="${comment}" prop="${field}")
-          el-select(v-model="form.${field}" placeholder="请选择${comment}")
-            el-option(label="请选择字典生成" value="" )
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
-        el-form-item(label="${comment}")
-          el-checkbox-group(v-model="form.${field}")
-            el-checkbox(
-              v-for="dict in dict.type.${dictType}"
-              :key="dict.value"
-              :label="dict.value">
-              {{dict.label}})
-#elseif($column.htmlType == "checkbox" && $dictType)
-        el-form-item(label="${comment}")
-          el-checkbox-group(v-model="form.${field}")
-            el-checkbox 请选择字典生成
-#elseif($column.htmlType == "radio" && "" != $dictType)
-        el-form-item(label="${comment}")
-          el-radio-group(v-model="form.${field}")
-            el-radio(
-              v-for="dict in dict.type.${dictType}"
-              :key="dict.value"
-              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
-            ) {{dict.label}}
-#elseif($column.htmlType == "radio" && $dictType)
-        el-form-item(label="${comment}")
-          el-radio-group(v-model="form.${field}")
-            el-radio(label="1") 请选择字典生成
-#elseif($column.htmlType == "datetime" || $column.htmlType == "date" || $column.htmlType == "time")
-#set($valueFormat = 'yyyy-MM-dd HH:mm:ss')
-#if($column.htmlType == "date")
-#set($valueFormat = 'yyyy-MM-dd')
-#elseif($column.htmlType == "time")
-#set($valueFormat = 'HH:mm:ss')
-#end
-        el-form-item(label="${comment}" prop="${field}")
-          el-date-picker(clearable size="small"
-                        v-model="form.${field}"
-                        type="$column.htmlType"
-                        value-format="$valueFormat"
-                        placeholder="选择${comment}")
-#elseif($column.htmlType == "textarea")
-        el-form-item(label="${comment}" prop="${field}")
-          el-input(v-model="form.${field}" type="textarea" placeholder="请输入内容")
-#end
-#end
-#end
-#end
-
-#if($table.sub)
-      el-divider(content-position="center") ${subTable.functionName}信息
-      el-row(:gutter="10" class="mb8")
-        el-col(:span="1.5")
-          el-button(type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}") 添加
-        el-col(:span="1.5")
-          el-button(type="danger" icon="el-icon-delete" size="mini" @click="handleDelete${subClassName}") 删除
-      el-table(:data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}")
-        el-table-column(type="selection" width="50" align="center" )
-        el-table-column(label="序号" align="center" prop="index" width="50")
-#foreach($column in $subTable.columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk || $javaField == ${subTableFkclassName})
-#elseif($column.list && "" != $javaField)
-        el-table-column(label="$comment" prop="${javaField}")
-          template(slot-scope="scope")
-            el-input(v-model="scope.row.$javaField" placeholder="请输入$comment")
-#end
-#end
-#end
-      .dialog-footer(slot="footer")
-        el-button(type="primary" @click="submitForm") 确 定
-        el-button(@click="cancel") 取 消
-</template>
-
-<script>
-import { list${ClassName}, get${ClassName}, del${ClassName}, add${ClassName}, update${ClassName}, export${ClassName} } from "@/api/${moduleName}/${className}";
-import ImportData from '@/components/ImportData';
-#if($table.hasPct())
-#end
-export default {
-  name: "${ClassName}",
-  components: {ImportData},
-#if(${dicts} != '')
-  dicts: [${dicts}],
-#end
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 选中数组
-      ids: [],
-#if($table.sub)
-      // 子表选中数据
-      checked${subClassName}: [],
-#end
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // ${functionName}表格数据
-      ${businessName}List: [],
-#if($table.sub)
-      // ${subTable.functionName}表格数据
-      ${subclassName}List: [],
-#end
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-#foreach ($column in $columns)
-#if(($column.htmlType == "datetime" || $column.htmlType == "date" || $column.htmlType == "time") && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      // $comment时间范围
-      daterange${AttrName}: [],
-#end
-#end
-      pageReq: {
-        page: 1,
-        size: 10
-      },
-      // 查询参数
-      queryParams: {
-#foreach ($column in $columns)
-#if($column.query)
-        $column.javaField: null#if($velocityCount != $columns.size()),#end
-
-#end
-#end
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-#foreach ($column in $columns)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-        $column.javaField: [
-          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
-        ]#if($velocityCount != $columns.size()),#end
-
-#end
-#end
-      },
-      columns: [
-#set($count1 = 0)
-#foreach ($column in $columns)
-    #if($column.list)
-    { key: $count1, label: "$column.columnComment", visible: #{if}($column.htmlType == 'imageUpload' || $column.htmlType == 'fileUpload' || $foreach.count > 10) false #else true #end },
-    #end
-    #set($count1 = $count1 + 1)
-#end
-     ],
-#if($queryLength >= 8)
-      showMoreCondition: false
-#end
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询${functionName}列表 */
-    getList() {
-      this.loading = true;
-#foreach ($column in $columns)
-#if(($column.htmlType == "datetime" || $column.htmlType == "date" || $column.htmlType == "time") && $column.queryType == "BETWEEN")
-      this.queryParams.params = {};
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if(($column.htmlType == "datetime"|| $column.htmlType == "date" || $column.htmlType == "time") && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
-        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
-        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
-      }
-#end
-#end
-      const pageReq = {...this.pageReq}
-      pageReq.page -= 1
-      list${ClassName}(this.queryParams, pageReq).then(response => {
-        this.${businessName}List = response.content;
-        this.total = response.totalElements;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-#foreach ($column in $columns)
-#if($column.htmlType == "radio")
-        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end,
-#elseif($column.htmlType == "checkbox")
-        $column.javaField: [],
-#else
-        $column.javaField: null,
-#end
-#end
-        #if($table.hasPct())pct: [],#end
-
-      };
-#if($table.sub)
-      this.${subclassName}List = [];
-#end
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.pageReq.page = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-#foreach ($column in $columns)
-#if(($column.htmlType == "datetime" || $column.htmlType == "date" || $column.htmlType == "time") && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      this.daterange${AttrName} = [];
-#end
-#end
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加${functionName}";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
-      get${ClassName}(${pkColumn.javaField}).then(response => {
-        const data = response.data;
-        #if($table.hasPct())data.pct = [data.provinceId, data.cityId, data.townId];#end
-
-        this.form = data;
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-        this.form.$column.javaField = this.form.${column.javaField}.split(",");
-#end
-#end
-#if($table.sub)
-        this.${subclassName}List = response.data.${subclassName}List;
-#end
-        this.open = true;
-        this.title = "修改${functionName}";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.#[[$]]#refs["form"].validate(valid => {
-        if (valid) {
-#if($table.hasPct())
-          const [provinceId, cityId, townId] = this.form.pct;
-          const form = {...this.form, provinceId, cityId, townId};
-#else
-          const form = {...this.form};
-#end
-
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-          form.$column.javaField = this.form.${column.javaField}.join(",");
-#end
-#end
-#if($table.sub)
-          form.${subclassName}List = this.${subclassName}List;
-#end
-          if (form.${pkColumn.javaField} != null) {
-            update${ClassName}(form).then(response => {
-              this.#[[$modal]]#.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            add${ClassName}(form).then(response => {
-              this.#[[$modal]]#.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids;
-      this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {
-        return del${ClassName}(${pkColumn.javaField}s);
-      }).then(() => {
-        this.getList();
-        this.#[[$modal]]#.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-#if($table.sub)
-	/** ${subTable.functionName}序号 */
-    row${subClassName}Index({ row, rowIndex }) {
-      row.index = rowIndex + 1;
-    },
-    /** ${subTable.functionName}添加按钮操作 */
-    handleAdd${subClassName}() {
-      let obj = {};
-#foreach($column in $subTable.columns)
-#if($column.pk || $column.javaField == ${subTableFkclassName})
-#elseif($column.list && "" != $javaField)
-      obj.$column.javaField = "";
-#end
-#end
-      this.${subclassName}List.push(obj);
-    },
-    /** ${subTable.functionName}删除按钮操作 */
-    handleDelete${subClassName}() {
-      if (this.checked${subClassName}.length == 0) {
-        this.msgError("请先选择要删除的${subTable.functionName}数据");
-      } else {
-        const ${subclassName}List = this.${subclassName}List;
-        const checked${subClassName} = this.checked${subClassName};
-        this.${subclassName}List = ${subclassName}List.filter(function(item) {
-          return checked${subClassName}.indexOf(item.index) == -1
-        });
-      }
-    },
-    /** 复选框选中数据 */
-    handle${subClassName}SelectionChange(selection) {
-      this.checked${subClassName} = selection.map(item => item.index)
-    },
-#end
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.#[[$modal]]#.confirm('是否确认导出所有${functionName}数据项？').then(() => {
-        this.exportLoading = true;
-        return export${ClassName}(queryParams);
-      }).then(response => {
-        this.download(response.msg);
-        this.exportLoading = false;
-      }).catch(() => {});
-    },
-    handleImport() {
-        this.$refs['ImportData'].start();
-    }
-  }
-};
-</script>