fix conflict

This commit is contained in:
caoqianming 2021-08-30 13:17:49 +08:00
commit 615e84e04a
1 changed files with 1 additions and 1 deletions

View File

@ -121,4 +121,4 @@ class OutputMaterialViewSet(CreateUpdateModelAMixin, ModelViewSet):
return OutputMaterialListSerializer
elif self.action == 'update':
return OutputMaterialUpdateSerializer
return OutputMaterialSerializer
return OutputMaterialSerializer