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

guoyujie

2025-09-04 48bd9e20aa649145c9bf643e375c0cd86f7bb800

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

@@ -42,7 +42,7 @@
    @ApiOperation("流程卡进度汇总")
    @SaCheckPermission("selectOrder.search")
    @PostMapping("/processCardProgressCollect/{orderId}")
    public Result processCardProgressCollect(@PathVariable String orderId, @RequestBody List<Integer> columns) {
    public Result processCardProgressCollect(@PathVariable String orderId, @RequestBody List<String> columns) {
        return Result.seccess(reportService.processCardProgressCollectSv(orderId, columns));
    }