Merge branch 'master' of http://git.shengws.com/csx/XT_New

controllers/new_mobile_api_controllers/new_login_api_controller.go

@@ -259,16 +259,7 @@ func (this *NewLoginApiController) LoginByCs() {
 			//service.GetOrgSubscibeState(&subscibe)
 			templateInfo, _ := service.GetOrgInfoTemplate(org.Id)
 
-			type MobileAdminUserInfo struct {
-				AdminUser    *models.AdminUser
-				Org          *models.Org
-				App          *models.OrgApp
-				AppRole      *models.App_Role
-				Subscibe     *models.ServeSubscibe
-				TemplateInfo *models.GobalTemplate
-			}
-
-			mobileAdminUserInfo := &MobileAdminUserInfo{
+			mobileAdminUserInfo := &mobile_api_controllers.MobileAdminUserInfo{
 				AdminUser:    &adminUser,
 				Org:          &org,
 				App:          &app,