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

@@ -81,7 +81,8 @@
         var targetUrl = $("#add").attr("action");
         var targetUrl = $("#add").attr("action");
         var data = $("#add").serializeJson();
         var data = $("#add").serializeJson();
         var newData = {};
         var newData = {};
-        newData['HrVO'] = {
+        newData['hrInputVO'] = {
+//            newData['HrVO'] = {
             name:data['name'],
             name:data['name'],
             username:data['username'],
             username:data['username'],
             telephone:data['phone'],
             telephone:data['phone'],
@@ -92,13 +93,12 @@
             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,