Merge remote-tracking branch 'remotes/origin/dev'

Ansjer/urls.py

@@ -210,7 +210,7 @@ urlpatterns = [
     url(r'^date/(?P<operation>.*)$', DateController.DateConView.as_view()),
 
     url(r'^equipment/flow_test$', EquipmentManager.uid_status_test),
-    url(r'^account/appFrequency/(?P<operation>.*)$', UserController.UserAppFrequencyView.as_view()),
+    # url(r'^account/appFrequency/(?P<operation>.*)$', UserController.UserAppFrequencyView.as_view()),
     url(r'^v2/userbrand/(?P<operation>.*)$', UserBrandControllerV2.UserBrandV2.as_view()),
     # url(r'^statistcs/appFrequencyMonth$', StatisticsController.statistcsAppFrequency),
     # url(r'^statistcs/appFrequencyYear$', StatisticsController.statistcsAppFrequencyYear),