修改配置

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

@@ -512,10 +512,7 @@ class ToolApi extends ApiBase {
     if (!email) {
       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 rc = System.getObject("util.execClient");
     var rtn = null;

igirl-zcapi/app/base/api/impl/trademark/phonesearch.js

@@ -141,7 +141,6 @@ class GsbMgSearchApi extends ApiBase {
                 content: e.stack,
                 clientIp: ""
             });
-            // console.log(e.stack, "mg操作失败>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
             return { status: -1, msg: "操作失败", data: null };
         }
     }