Merge remote-tracking branch 'origin/master'

# Conflicts:
#	apps/tenant/operation_help/views.py

apps/tenant/operation_help/views.py

@@ -2,10 +2,11 @@
 
 from utils.custom_modelviewset import CustomModelViewSet
 from rest_framework.decorators import action
-import json
+from rest_framework import generics
+
 
 from .models import OperationHelp,OperationHelpUpfile
-from utils.permission import IsAdministratorUser, isLogin
+from utils.permission import isLogin
 from .serializer import OperationHelpSerializer
 from apps.tenant import tenant_log
 from apps.log.models import BizLog