Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-08-26 d3dfcd3e96cb0f2b04cfe973e4f348ee5fe96032

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java

@@ -330,4 +330,10 @@
                                  @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.selectSortTableSv(object));
    }

    @ApiOperation("合并流程卡接口")
    @PostMapping("/mergeFlowCard")
    public Result mergeFlowCard(@RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.mergeFlowCard(object));
    }
}