Эх сурвалжийг харах

Merge branch 'Bin_Local_User' into dev

# Conflicts:
#	Ansjer/urls.py
tanghongbin 4 жил өмнө
parent
commit
efa92cbf24
1 өөрчлөгдсөн 1 нэмэгдсэн , 5 устгасан
  1. 1 5
      Ansjer/urls.py

+ 1 - 5
Ansjer/urls.py

@@ -11,8 +11,7 @@ from Controller import FeedBack, EquipmentOTA, EquipmentInfo, AdminManage, AppIn
     AppSetController, \
     ApplicationController, UserExController, CloudStorage, TestApi, UserBrandControllerV2, \
     StatisticsController, Alexa, FAQController, AppLogController, EquipmentVersionLimit, VoicePromptController, \
-    CDKController, DeviceTypeController
-from Controller.VoicePromptController import VoicePromptView
+    DeviceTypeController
 
 urlpatterns = [
     url(r'^testApi/(?P<operation>.*)$', TestApi.testView.as_view()),
@@ -251,9 +250,6 @@ urlpatterns = [
     # 设备类型
     url(r'^deviceType/(?P<operation>.*)$', DeviceTypeController.DeviceTypeView.as_view()),
 
-    # cdk(激活码)
-    url(r'^cdk/(?P<operation>.*)$', CDKController.CDKView.as_view()),
-
     # app 设备消息模板
     # 路由加参数参考
     # url(r'^(?P<path>.*)/(?P<UID>.*)/lls$', Test.Test.as_view(), name=u'gg'),