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

fix: 解决 master 冲突

Browse Source
This commit is contained in:
Bai
2023-09-21 16:51:54 +08:00
parent 9892ff7dd6 f6f162ec3a
commit 1de7af4984
2 changed files with 4 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/accounts/serializers/account/account.py
View File

@@ -438,7 +438,10 @@ class AccountHistorySerializer(serializers.ModelSerializer):
class Meta:
model = Account.history.model
fields = ['id', 'secret', 'secret_type', 'version', 'history_date', 'history_user']
fields = [
'id', 'secret', 'secret_type', 'version', 'history_date',
'history_user'
]
read_only_fields = fields
extra_kwargs = {
'history_user': {'label': _('User')},