fix: merge issue
This commit is contained in:
@@ -5,6 +5,6 @@ INSERT IGNORE INTO `sys_role` VALUES (2, 'role.adminAssign', 'administrator', 2,
|
||||
INSERT IGNORE INTO `sys_role` VALUES (3, 'role.operator', 'operator', 3, '1', '1', '1', '1', '0', 'supervisor', 1698486934900, 'supervisor', 1717143582784, 'role.operatorRemark');
|
||||
INSERT IGNORE INTO `sys_role` VALUES (4, 'role.monitor', 'monitor', 4, '1', '1', '1', '1', '0', 'supervisor', 1698486950714, 'supervisor', 1706774389300, 'role.monitorRemark');
|
||||
INSERT IGNORE INTO `sys_role` VALUES (5, 'role.vistor', 'vistor', 5, '1', '1', '1', '1', '0', 'supervisor', 1698486975779, 'supervisor', 1706774405096, 'role.vistorRemark');
|
||||
INSERT IGNORE INTO `sys_role` (`role_id`, `role_name`, `role_key`, `role_sort`, `data_scope`, `menu_check_strictly`, `dept_check_strictly`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (100, 'role.tenant', 'tenant', 100, '2', '1', '1', '1', '0', 'admin', 1715591950609, 'supervisor', 1718701342318, '');
|
||||
INSERT IGNORE INTO `sys_role` VALUES (100, 'role.tenant', 'tenant', 100, '2', '1', '1', '1', '0', 'admin', 1715591950609, 'supervisor', 1718701342318, '');
|
||||
|
||||
SET FOREIGN_KEY_CHECKS=1;
|
||||
Reference in New Issue
Block a user