From c70d3f2aaf0f576c4d61255c691ad335eb551606 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 24 五月 2024 18:15:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
index 7657b26..7e5ce04 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
@@ -85,7 +85,7 @@
@GetMapping("/{id}")
@CloudRequiredPermission("business:carusebook:query")
public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- return ApiResponse.success(carUseBookService.findById(id));
+ return ApiResponse.success(carUseBookService.findById(id,getLoginUser(token).getMemberId()));
}
@ApiOperation("鏌ヨ杞﹁締棰勭害璁板綍")
@@ -100,4 +100,11 @@
return ApiResponse.success(carUseBookService.checkDateUse(carId,dateDay));
}
+ @ApiOperation("鐢宠鎾ら攢")
+ @GetMapping("/revoke")
+ public ApiResponse revoke (@RequestParam Integer id, @RequestParam String info, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ carUseBookService.revoke(id,info,getLoginUser(token));
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
}
--
Gitblit v1.9.3