bob
/
newmediamonitoring
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#view

This commit is contained in:
Bob 2020-08-20 15:50:21 +08:00
parent 47dfab6250
commit 4436fdfae5
1 changed files with 193 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dashboard/views.py
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
from captcha.helpers import captcha_image_url
from captcha.models import CaptchaStore
from django.contrib import messages
@ -192,7 +191,6 @@ def get_village(request):
for i in village:
res.append([i.code, i.name, i.level, i.pcode])
return JsonResponse({"village": res})
=======
from captcha.helpers import captcha_image_url
from captcha.models import CaptchaStore
from django.contrib import messages
@ -386,4 +384,3 @@ def get_village(request):
for i in village:
res.append([i.code, i.name, i.level, i.pcode])
return JsonResponse({"village": res})
>>>>>>> 8abe1a2f5f39f2a197eb308666a6c3267907510e