Merge branch 'dev' of http://192.168.136.45:3000/SERVER/AnsjerServer into dev

Ansjer/urls.py

@@ -114,7 +114,7 @@ urlpatterns = [
     # 重置密码验证码校验
     url(r'^v2/authcode/verify$', UserController.verifyAuthcode.as_view()),
     url(r'^v2/account/logout$', UserController.V2LogoutView.as_view()),
-    url(r'^v2/account/dc_login$', UserController.v3LoginView.as_view()),
+    url(r'^v2/account/login$', UserController.v3LoginView.as_view()),
     # 新增
     url(r'^detect/detect_group_push$',DetectController.NotificationView.detect_group_push),
     url(r'^detect/add$', DetectController.PushNotificationView.as_view()),