Merge branch 'dev' of http://192.168.136.99:3000/servers/ASJServer into dev

WebController/RoleController.py → AdminController/RoleController.py

@@ -56,5 +56,5 @@ class RoleView(View):
                 return response.json(404)
 
     def getList(self, userID, request_dict, response):
-        role_qs =Role.objects.all().values('rid','roleName');
+        role_qs =Role.objects.all().values('rid','roleName','Description');
         return response.json(0, {'list': CommonService.qs_to_list(role_qs)})

Ansjer/urls.py

@@ -19,7 +19,7 @@ from Controller import FeedBack, EquipmentOTA, EquipmentInfo, AdminManage, AppIn
     OrderTaskController, HistoryUIDController, UIDManageUserController, SerialNumberController, CompanyController, \
     RegionController, VPGController, LanguageController, TestController, DeviceConfirmRegion, S3GetStsController, \
     DetectControllerV2, ShadowController, TestDetectController, PcInfo, PctestController, DeviceDebug
-from WebController import UserLoginController, RoleController
+from AdminController import UserLoginController, RoleController
 
 urlpatterns = [
     url(r'^testApi/(?P<operation>.*)$', TestApi.testView.as_view()),