perf: 处理冲突

This commit is contained in:
jiangweidong
2023-02-07 08:55:57 +08:00
135 changed files with 2732 additions and 3395 deletions

View File

@@ -70,7 +70,6 @@ exclude_permissions = (
('rbac', 'orgrolebinding', 'change', 'orgrolebinding'),
('rbac', 'menupermission', '*', 'menupermission'),
('rbac', 'role', '*', '*'),
('ops', 'adhoc', 'delete,change', '*'),
('ops', 'adhocexecution', 'add,delete,change', '*'),
('ops', 'jobexecution', 'change,delete', 'jobexecution'),
('ops', 'historicaljob', '*', '*'),