fixed

src/main/java/cn/cslg/pas/controller/PatentController.java

@@ -207,49 +207,6 @@ public class PatentController {
         return Response.success(personId);
     }
 
-    @Operation(summary = "专利列表上新增发明人/权利人/申请人合并")
-    @PostMapping("/mergePerson")
-    public Response mergePerson(@RequestBody MergePersonVO personVO) throws Exception {
-        Integer personId = null;
-        try {
-            personId = mergePersonService.mergePerson(personVO);
-        } catch (Exception e) {
-            return Response.error(e.getMessage());
-        }
-        return Response.success(personId);
-    }
-
-    @Operation(summary = "专利列表上再次新增发明人/权利人/申请人合并")
-    @PostMapping("/mergePersonAgain")
-    public Response mergePersonAgain(@RequestBody MergePersonAgainVO againVO) throws Exception {
-        Integer personId = null;
-        try {
-            personId = mergePersonService.mergePersonAgain(againVO);
-        } catch (Exception e) {
-            return Response.error(e.getMessage());
-        }
-        return Response.success(personId);
-    }
-
-    @Operation(summary = "专利列表上编辑发明人/权利人/申请人合并")
-    @PostMapping("/updateMergePerson")
-    public Response updateMergePerson(@RequestBody MergePersonVO personVO) throws Exception {
-        Integer personId = null;
-        try {
-            personId = mergePersonService.updateMergePerson(personVO);
-        } catch (Exception e) {
-            return Response.error(e.getMessage());
-        }
-        return Response.success(personId);
-    }
-
-    @Operation(summary = "发明人/权利人/申请人合并列表查询")
-//    @PostMapping("/selectMergePerson")
-    public Response selectMergePerson(@RequestBody MergePersonQueryVO vo) {
-        Records records = mergePersonService.selectMergePersonList(vo);
-        return Response.success(records);
-    }
-
     @Operation(summary = "合并人员详情")
     @PostMapping("/selectMergePersonDetail")
     public Response selectMergePersonDetail(@RequestBody MergePersonIdVO vo) {
@@ -264,18 +221,6 @@ public class PatentController {
         return Response.success(records);
     }
 
-    @Operation(summary = "发明人/权利人/申请人合并后的名称移除")
-    @PostMapping("/delMergedName")
-    public Response delMergedName(@RequestBody MergedNameVO vo) throws Exception {
-        Integer id = null;
-        try {
-            id = mergePersonService.delMergedName(vo);
-        } catch (Exception e) {
-            return Response.error(e.getMessage());
-        }
-        return Response.success(id);
-    }
-
     @Operation(summary = "发明人/权利人/申请人合并记录删除")
     @PostMapping("/delMergePerson")
     public Response delMergePerson(@RequestBody MergePersonIdVO vo) throws Exception {