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

@@ -85,19 +85,20 @@
             name:data['name'],
             name:data['name'],
             username:data['username'],
             username:data['username'],
             telephone:data['phone'],
             telephone:data['phone'],
-            phone:data['phone'],
+//            phone:data['phone'],
             password:data['password'],
             password:data['password'],
             roleIds:data['roles'],
             roleIds:data['roles'],
 //            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,