mirror of https://github.com/jumpserver/jumpserver
fix: fix conflicts
parent
928513edd0
commit
21da805e78
|
@ -385,10 +385,7 @@ 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')},
|
||||
|
|
Loading…
Reference in New Issue