Merge branch 'master' of http://git.zzliaoyuan.com:4000/wushaodong/decorate

apps/customer/models.py

@@ -42,7 +42,7 @@ class ReportCustomer(models.Model):
         permissions = [
             ('view_customer', u'查看'),
             ('add_customer', u'添加'),
-            ('update_customer',u'更新'),
+            ('update_customer', u'更新'),
             ('delete_customer', u'删除'),
             ('check_customer', u'审核'),
         ]

apps/customer/views.py

@@ -65,11 +65,11 @@ class ReportCustomerDictView(APIView):
     permission_classes = []
 
     def get(self, request):
-        rows = Option.objects.filter(Q(type=Option.CUSTOMER_SOURCE)|Q(type=Option.CATEGORY), enable=True)
+        rows = Option.objects.filter(Q(type=Option.CUSTOMER_SOURCE) | Q(type=Option.CATEGORY), enable=True)
         serializer = OptionComboboxSerializer(rows, many=True)
         return response_ok({
-            "source": serializer.data,
-            "project": serializer.data,
+            'source': serializer.data,
+            'project': serializer.data,
         })