Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop

@@ -89,12 +89,13 @@
             roles:data['roles'],
             roles:data['roles'],
             departmentId:data['children']
             departmentId:data['children']
         };
         };
+
 //        newData['DepartmentVO'] = {
 //        newData['DepartmentVO'] = {
 //            children:data['children']
 //            children:data['children']
 //            departmentId:data['children']
 //            departmentId:data['children']
 //        };
 //        };
-        console.log(JSON.stringify(newData));
-        return false;
+//        console.log(JSON.stringify(newData));
+//        return false;
         $.ajax({
         $.ajax({
             type: 'post',
             type: 'post',
             url: apiBaseUrl + targetUrl,
             url: apiBaseUrl + targetUrl,