github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-16 07:18:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into pr@dev@change_import (#11815)

Browse Source 
* perf: 修改获取 ip

* perf: 修改导入

---------

Co-authored-by: ibuler <ibuler@qq.com>
This commit is contained in:
fit2bot
2023-10-12 16:17:32 +08:00
committed by GitHub
parent ce63ea7528
commit 9f042cfa04
16 changed files with 85 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/accounts/api/account/account.py
View File

@@ -9,8 +9,9 @@ from accounts.filters import AccountFilterSet
from accounts.mixins import AccountRecordViewLogMixin
from accounts.models import Account
from assets.models import Asset, Node
from authentication.permissions import UserConfirmation, ConfirmType
from common.api.mixin import ExtraFilterFieldsMixin
from common.permissions import UserConfirmation, ConfirmType, IsValidUser
from common.permissions import IsValidUser
from orgs.mixins.api import OrgBulkModelViewSet
from rbac.permissions import RBACPermission