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

@@ -86,11 +86,13 @@
             username:data['username'],
             phone:data['phone'],
             password:data['password'],
-            roles:data['roles']
-        };
-        newData['DepartmentVO'] = {
-            children:data['children']
+            roles:data['roles'],
+            departmentId:data['children']
         };
+//        newData['DepartmentVO'] = {
+//            children:data['children']
+//            departmentId:data['children']
+//        };
         console.log(JSON.stringify(newData));
         return false;
         $.ajax({