mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

Browse Source
This commit is contained in:
mkm 2024-07-02 18:28:25 +08:00
commit 9c7299a408
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/logic/auth/AdminLogic.php
View File

@ -225,7 +225,7 @@ class AdminLogic extends BaseLogic
{ {
$admin = Admin::field([ $admin = Admin::field([
'id', 'account', 'name', 'disable', 'root', 'id', 'account', 'name', 'disable', 'root',
'multipoint_login', 'avatar', 'multipoint_login', 'avatar','role_id'
])->findOrEmpty($params['id'])->toArray(); ])->findOrEmpty($params['id'])->toArray();
if ($action == 'detail') { if ($action == 'detail') {

2
app/store/logic/auth/AdminLogic.php
View File

@ -225,7 +225,7 @@ class AdminLogic extends BaseLogic
public static function detail($params, $action = 'detail'): array public static function detail($params, $action = 'detail'): array
{ {
$admin = SystemStoreStaff::field([ $admin = SystemStoreStaff::field([
'id', 'account', 'staff_name', 'avatar', 'is_admin', 'is_manager', 'store_id' 'id', 'account', 'staff_name', 'avatar', 'is_admin', 'is_manager', 'store_id','role_id'
])->findOrEmpty($params['id'])->toArray(); ])->findOrEmpty($params['id'])->toArray();
if ($action == 'detail') { if ($action == 'detail') {