Merge branch 'feature/mzl_dev' into develop
# Conflicts: # app/functions.php # config/middleware.php
This commit is contained in:
@@ -58,7 +58,8 @@ class User extends Model
|
||||
'phone',
|
||||
'email',
|
||||
'status',
|
||||
'system_code'
|
||||
'system_code',
|
||||
'corp_id'
|
||||
];
|
||||
|
||||
// 用户所有角色
|
||||
|
||||
Reference in New Issue
Block a user