Merge branch 'feature/mzl_dev' into develop

# Conflicts:
#	app/functions.php
#	config/middleware.php
This commit is contained in:
mzl
2025-07-09 19:11:57 +08:00
parent 03a6d65b00
commit 3d8d9f841a
24 changed files with 1342 additions and 954 deletions
+2 -1
View File
@@ -58,7 +58,8 @@ class User extends Model
'phone',
'email',
'status',
'system_code'
'system_code',
'corp_id'
];
// 用户所有角色