更新冲突
This commit is contained in:
commit
f3590d0186
1
.gitignore
vendored
1
.gitignore
vendored
@ -9,3 +9,4 @@
|
|||||||
/runtime/*
|
/runtime/*
|
||||||
!/runtime/index.html
|
!/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') {
|
if (strtolower(str_replace('.', '\\', $request->controller())) === 'setting\system\log') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (strtolower(str_replace('.', '\\', $request->controller())) === 'auth\menu') {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
//获取操作注解
|
//获取操作注解
|
||||||
$notes = '';
|
$notes = '';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user