From 76f834a60cd35247b18e9bc9f53ee6dcf2ad08ba Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 05 三月 2025 16:53:25 +0800
Subject: [PATCH] Merge branch 'dev' into dev_zj

---
 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