fix: 解决冲突

center-channel/app/base/api/impl/action/tmQuery.js

@@ -91,18 +91,13 @@ class TmQueryAPI extends WEBBase {
             case "icheming"://商标智能分析  -----
                 opResult = await this.toolSve.icheming(action_body, req);
                 break;
-<<<<<<< HEAD
             case "tmreport"://商标报告--TODO:后期将要迁移到center-service
-                opResult = await this.tmquerySve.tmreport(action_body, req);
-=======
-            case "tmreport"://商标报告
-                var rtn=await this.tmquerySve.tmreport(action_body,req);  
-                if(rtn.code>0){
-                    opResult=system.getResultSuccess();
-                  }else{
-                    opResult=system.getResultFail();
-                  }
->>>>>>> 1b1e1a18ad0965b4585d785aad9aeea26232862b
+                var rtn = await this.tmquerySve.tmreport(action_body, req);
+                if (rtn.code > 0) {
+                    opResult = system.getResultSuccess();
+                } else {
+                    opResult = system.getResultFail();
+                }
                 break;
             default:
                 opResult = system.getResult(null, "action_type参数错误");