Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-05 cd24a045bd9ee29505ddc9760d25f5d4037f4f0c

 ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java

@@ -49,6 +49,12 @@
        return reportService.importData(form);
    }

    @GetMapping("/getTogether/{pid}")
    @ApiOperation(value = "获取同一批次的报备", notes = "获取同一批次的报备")
    public Result getTogether(@PathVariable("pid") String pid) {
        return reportService.getTogether(pid);
    }

    @PostMapping("/importTemplate")
    @ApiOperation(value = "导入模板", notes = "导入模板")
    @PreAuthorize("@ss.hasPermi('system:report:add')")