Merge branch 'fix/restful_promise' into 'wrdp'

修复restful方法成功返回的resolve的值

See merge request o2oa/o2oa!6148

o2web/source/o2_core/o2.js

@@ -1615,8 +1615,8 @@ if (!window.o2) {
                                 if (layout.config && layout.config.sessionStorageEnable) sessionStorage.setItem("o2LayoutSessionToken", xToken);
                             }
                             var r = o2.runCallback(callback, "success", [responseJSON], null);
-                            //resolve(r || responseJSON);
-                            resolve(responseJSON);
+                            resolve(r || responseJSON);
+                            //resolve(responseJSON);
                             //return o2.runCallback(callback, "success", [responseJSON],null, resolve);
                         },
                         onFailure: function (xhr) {