From c149785de7ceeafdef6acd38b448edddaa719ce1 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 17 Apr 2020 10:13:58 +0800 Subject: [PATCH] daoru user --- test_server/crm/views.py | 3 +-- test_server/media/muban/user.xlsx | Bin 11651 -> 13300 bytes 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/test_server/crm/views.py b/test_server/crm/views.py index 12e262d..2cfa38e 100644 --- a/test_server/crm/views.py +++ b/test_server/crm/views.py @@ -206,8 +206,7 @@ class ConsumerViewSet(ModelViewSet): return Response({"error":"不存在单位("+companyname+")!请先新建"}) else: companyobj = Company.objects.get(id=companydict[companyname]) - subjects = sheet['d'+str(m)].value - workscope = sheet['e'+str(m)].value + workscope = sheet['d'+str(m)].value if Consumer.objects.filter(username = username).exists(): obj = Consumer.objects.filter(username = username).first() else: diff --git a/test_server/media/muban/user.xlsx b/test_server/media/muban/user.xlsx index b1f2f98a001d037ae9bd6882b823da25d79b2419..6d9d6251aa8f6383206cf32d521105133c63a473 100644 GIT binary patch delta 6743 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 YC-vy4