From 14a20df4699cf3d933e2bdbe1ba2aba15ade1059 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期二, 26 十一月 2024 09:20:02 +0800 Subject: [PATCH] 解决冲突 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java index bb4103e..57d7c63 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java @@ -90,7 +90,6 @@ @GetMapping("/{id}") @CloudRequiredPermission("business:ywcontractbill:query") public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { - - return ApiResponse.success(ywContractBillService.findById(id)); + return ApiResponse.success(ywContractBillService.getDetail(id)); } } -- Gitblit v1.9.3