Skip to content

Z
zhichan
Commit b6e42515 by sxy
Options

fix: 解决冲突

parent 40427c1c
Showing with 6 additions and 11 deletions
center-channel/app/base/api/impl/action/tmQuery.js
...@@ -91,18 +91,13 @@ class TmQueryAPI extends WEBBase { ...@@ -91,18 +91,13 @@ class TmQueryAPI extends WEBBase {
case "icheming"://商标智能分析 ----- case "icheming"://商标智能分析 -----
opResult = await this.toolSve.icheming(action_body, req); opResult = await this.toolSve.icheming(action_body, req);
break; break;
<<<<<<< HEAD
case "tmreport"://商标报告--TODO:后期将要迁移到center-service case "tmreport"://商标报告--TODO:后期将要迁移到center-service
opResult = await this.tmquerySve.tmreport(action_body, req); var rtn = await this.tmquerySve.tmreport(action_body, req);
======= if (rtn.code > 0) {
case "tmreport"://商标报告 opResult = system.getResultSuccess();
var rtn=await this.tmquerySve.tmreport(action_body,req); } else {
if(rtn.code>0){ opResult = system.getResultFail();
opResult=system.getResultSuccess(); }
}else{
opResult=system.getResultFail();
}
>>>>>>> 1b1e1a18ad0965b4585d785aad9aeea26232862b
break; break;
default: default:
opResult = system.getResult(null, "action_type参数错误"); opResult = system.getResult(null, "action_type参数错误");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment