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

@@ -84,9 +84,11 @@
         newData['HrVO'] = {
         newData['HrVO'] = {
             name:data['name'],
             name:data['name'],
             username:data['username'],
             username:data['username'],
+            telephone:data['phone'],
             phone:data['phone'],
             phone:data['phone'],
             password:data['password'],
             password:data['password'],
-            roles:data['roles'],
+            roleIds:data['roles'],
+//            roles:data['roles'],
             departmentId:data['children']
             departmentId:data['children']
         };
         };