修改配置

igirl-zcapi/app/base/api/impl/tool/toolApi.js

@@ -512,6 +512,10 @@ class ToolApi extends ApiBase {
     if (!email) {
     if (!email) {
       return { code: -2, msg: "邮箱参数错误" };
       return { code: -2, msg: "邮箱参数错误" };
     }
     }
+<<<<<<< HEAD
+=======
+    //idc92.gongsibao.com (43.247.184.92)
+>>>>>>> acb44dbeda198fd434def436284ddaad0c550e55
     var url = "http://idc92.gongsibao.com:8015/tmdoc/api/createdoc?mycompanyname=" + encodeURIComponent(mycompanyname);
     var url = "http://idc92.gongsibao.com:8015/tmdoc/api/createdoc?mycompanyname=" + encodeURIComponent(mycompanyname);
     var rc = System.getObject("util.execClient");
     var rc = System.getObject("util.execClient");
     var rtn = null;
     var rtn = null;