From deb25b1c56eafc4a8a9fc293b7807baad99e216c Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 03 四月 2025 15:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency

---
 cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java
index cf573fa..5e94d64 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java
+++ b/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());
+        }
     }
-
-
-
 }

--
Gitblit v1.9.3