更新冲突
This commit is contained in:
commit
f3590d0186
3
.gitignore
vendored
3
.gitignore
vendored
@ -8,4 +8,5 @@
|
||||
!/public/uploads/index.html
|
||||
/runtime/*
|
||||
!/runtime/index.html
|
||||
/config/install.lock
|
||||
/config/install.lock
|
||||
/public/nginx.htaccess
|
||||
|
@ -31,9 +31,6 @@ class OperationLog
|
||||
if (strtolower(str_replace('.', '\\', $request->controller())) === 'setting\system\log') {
|
||||
return;
|
||||
}
|
||||
if (strtolower(str_replace('.', '\\', $request->controller())) === 'auth\menu') {
|
||||
return;
|
||||
}
|
||||
|
||||
//获取操作注解
|
||||
$notes = '';
|
||||
|
Loading…
x
Reference in New Issue
Block a user