From c9d137bc209ab745c1765d25de64a072b0561e65 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 13 Aug 2018 11:44:44 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9Mixin=EF=BC=8C?= =?UTF-8?q?=E5=85=81=E8=AE=B8org=5Fid=E4=B8=8D=E5=A1=AB=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/orgs/mixins.py | 2 +- apps/users/serializers.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/orgs/mixins.py b/apps/orgs/mixins.py index 99140f40b..e613c81ef 100644 --- a/apps/orgs/mixins.py +++ b/apps/orgs/mixins.py @@ -55,7 +55,7 @@ class OrgManager(models.Manager): class OrgModelMixin(models.Model): - org_id = models.CharField(max_length=36, null=True, blank=True) + org_id = models.CharField(max_length=36, null=True, blank=True, default=None) objects = OrgManager() def save(self, *args, **kwargs): diff --git a/apps/users/serializers.py b/apps/users/serializers.py index 9f99c0171..bef37d91f 100644 --- a/apps/users/serializers.py +++ b/apps/users/serializers.py @@ -65,6 +65,7 @@ class UserGroupSerializer(BulkSerializerMixin, serializers.ModelSerializer): model = UserGroup list_serializer_class = BulkListSerializer fields = '__all__' + read_only_fields = ['id', 'created_by'] @staticmethod def get_users(obj):