Merge branch 'develop' into feature/mzl_dev

# Conflicts:
#	config/route.php
This commit is contained in:
mzl
2025-10-30 14:39:10 +08:00
parent a7d623656d
commit 8c3a445a39
32 changed files with 2004 additions and 7 deletions
+1 -1
View File
@@ -61,7 +61,7 @@ class SysOpLogService
// 关键字
if (isset($p['keyword']) && $p['keyword']) {
$k = '%' . $p['keyword'] . '%';
foreach (['user_name', 'route'] as $col) {
foreach (['user_name', 'route', 'params_brief'] as $col) {
$config['orWhere'][] = [$col, 'like', $k];
}
}