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

[Update] Merge from dev

Browse Source
This commit is contained in:
Bai
2020-04-10 14:46:35 +08:00
parent 88fcf8dbd7 27ffed1be9
commit d1d73da322
30 changed files with 370 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/users/serializers/user.py
View File

@@ -42,8 +42,7 @@ class UserSerializer(BulkSerializerMixin, serializers.ModelSerializer):
'groups', 'role', 'wechat', 'phone', 'mfa_level',
'comment', 'source', 'is_valid', 'is_expired',
'is_active', 'created_by', 'is_first_login',
'password_strategy',
'date_password_last_updated', 'date_expired',
'password_strategy', 'date_password_last_updated', 'date_expired',
'avatar_url',
]
extra_kwargs = {