From f8b1073fbb28d37e08016eed32c682f8c5eae391 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 02 二月 2024 17:26:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java b/server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java
index f3ecd19..ad43c63 100644
--- a/server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java
@@ -85,8 +85,6 @@
     }
 
 
-
-
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @RequiresPermissions("business:settleclaims:query")
@@ -104,7 +102,13 @@
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
     @RequiresPermissions("business:settleclaims:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(settleClaimsService.findById(id));
+    public ApiResponse<SettleClaims> findById(@PathVariable Integer id) {
+        return ApiResponse.success(settleClaimsService.getSettleClaimsDetail(id));
+    }
+    @ApiOperation("鍒犻櫎闄勪欢")
+    @GetMapping("/delFile/{id}/{fileId}")
+    @RequiresPermissions("business:settleclaims:update")
+    public ApiResponse delFile(@PathVariable(name = "id") Integer id,@PathVariable(name = "fileId") Integer fileId) {
+        return ApiResponse.success(settleClaimsService.delFile(id,fileId));
     }
 }

--
Gitblit v1.9.3