Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb

zhuo

2025-04-17 f67aa8b146f0fa901ce4ae183be511d8615cde77

 cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java

@@ -79,9 +79,10 @@
    @ApiOperation(value = "导入作废文件销毁记录")
    @PostMapping("/exportInManageRecordCancel")
    public Result exportInManageRecordCancel(MultipartFile file){
        return Result.success(manageRecordCancelService.exportInManageRecordCancel(file));
        try {
            return Result.success(manageRecordCancelService.exportInManageRecordCancel(file));
        }catch (Exception e){
            return Result.fail(e.getMessage());
        }
    }



}