Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

package.json

@@ -93,7 +93,7 @@
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-react": "^1.0.6",
         "@wisdom-cesium/cesium": "^1.0.78",
-        "@wisdom-cesium/krpano": "^1.0.29-23",
+        "@wisdom-cesium/krpano": "^1.0.29-26",
         "@wisdom-map/amap": "1.1.0-beta.45",
         "@wisdom-map/arcgismap": "1.4.0-124",
         "@wisdom-map/basemap": "1.1.0-24",
@@ -123,7 +123,7 @@
         "lodash": "4.17.11",
         "minimist": "1.2.0",
         "panda-xform": "^1.5.9",
-        "parseForm": "^1.8.3",
+        "parseForm": "^2.2.4",
         "prop-types": "15.7.2",
         "quill": "^1.3.7",
         "rc-tween-one": "^3.0.6",

src/pages/userCenter/userManage/UserManage.jsx

@@ -456,7 +456,7 @@ const UserManage = () => {
       GetOUTreeNew({ keyword: '' })
         .then(newres => {
           if (newres.code === 0) {
-            let res = newres.data;
+            let res = newres.data.list;
             setTreeDataCopy(res);
           }
         })
@@ -497,7 +497,7 @@ const UserManage = () => {
     GetOUTreeNew({ keyword: searchWordOrg })
       .then(newres => {
         if (newres.code === 0) {
-          let res = newres.data;
+          let res = newres.data.list;
           setTreeDataCopy(res);
           console.log(res);
           let aa = [];
@@ -1410,7 +1410,7 @@ const UserManage = () => {
     GetOUTreeNew({ selectOU: -1 })
       .then(newres => {
         if (newres.code === 0) {
-          let res = newres.data;
+          let res = newres.data.list;
           setTreeLoading(false);
           setSearchWord('');
           setFilteredValue([]);