gyq

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

@@ -31,7 +31,6 @@ class PatentQueryAPI extends WEBBase {
             case "test": //测试
                 opResult = system.getResultSuccess(null, "测试成功");
                 break;
-<<<<<<< HEAD
             case "CommomSearchbyApplicant"://根据申请人查询聚合
             case "paCountByApplicantName"://根据申请人获取专利量
             case "paShortListByApplicantName"://根据申请人获取专利详情列表
@@ -47,23 +46,6 @@ class PatentQueryAPI extends WEBBase {
             case "CommomSearchbyInventor"://根据发明人查询聚合
             case "CommomSearchbyFilingno"://根据申请号查询聚合
             case "CommomSearchbyPubno"://根据公开号查询聚合
-=======
-            case "CommomSearchbyApplicant": //根据申请人查询聚合
-            case "paCountByApplicantName": //根据申请人获取专利量
-            case "paShortListByApplicantName": //根据申请人获取专利详情列表
-            case "paDetailsBypubNo": //根据公开或授权号获取专利详情列表
-            case "paDetailsByfilingNo": //根据申请号获取专利详情列表
-            case "softwareCountByAuthor": //根据公司名称得到软著量
-            case "softwareListByAuthor": //根据公司名称得到软著详情
-            case "softwareDetailsByregNum": //根据登记号获取软著详情
-            case "worksCountByAuthor": //根据公司名称得到著作权量
-            case "worksListByAuthor": //根据公司名称得到著作权详情
-            case "worksDetailsByregNum": //根据登记号获取著作权详情
-            case "CommomSearchbyTitle": //根据标题查询聚合
-            case "CommomSearchbyFilingno": //根据申请号查询聚合
-            case "CommomSearchbyPubno": //根据公开号查询聚合
-            case "CommomSearchbyInventor": //根据发明人查询聚合
->>>>>>> 1f291c4bd811d0cd3a2e4d15a61274bfcceee4bd
                 opResult = await this.patentSve.opReqResult(pobj, req);
                 break;
             default: