gyq

igirl-zcapi/app/base/api/impl/action/patentQuery.js

@@ -46,23 +46,7 @@ class PatentQueryAPI extends APIBase {
             case "paDetailsByfilingNo": //根据申请号获取专利详情列表
             case "paDetailsByfilingNo": //根据申请号获取专利详情列表
                 opResult = await this.cpatentsearchApi.paDetailsByfilingNo(action_body);
                 opResult = await this.cpatentsearchApi.paDetailsByfilingNo(action_body);
                 break;
                 break;
-<<<<<<< HEAD
-            case "CommomSearchbyTitle"://根据标题查询聚合
-                opResult = await this.cpatentsearchApi.CommomSearchbyTitle(action_body);
-                break;
-            case "CommomSearchbyInventor"://根据发明人查询聚合
-                opResult = await this.cpatentsearchApi.CommomSearchbyInventor(action_body);
-                break;
-            case "CommomSearchbyFilingno"://根据申请号查询聚合
-                opResult = await this.cpatentsearchApi.CommomSearchbyFilingno(action_body);
-                break;
-            case "CommomSearchbyPubno"://根据公开号查询聚合
-                opResult = await this.cpatentsearchApi.CommomSearchbyPubno(action_body);
-                break;
             case "softwareCountByAuthor"://根据公司名称得到软著量
             case "softwareCountByAuthor"://根据公司名称得到软著量
-=======
-            case "softwareCountByAuthor": //根据公司名称得到软著量
->>>>>>> 992d916f718e2f58a2b66b00d8a7fa13b308f003
                 opResult = await this.copyrightApi.softwareCountByAuthor(action_body);
                 opResult = await this.copyrightApi.softwareCountByAuthor(action_body);
                 break;
                 break;
             case "softwareListByAuthor": //根据公司名称得到软著详情
             case "softwareListByAuthor": //根据公司名称得到软著详情