From b771d62db31bb113aff6db1be958ca83d591212f Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期六, 11 五月 2024 11:58:44 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java index b400986..3fe1216 100644 --- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java +++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java @@ -78,14 +78,14 @@ @ApiOperation("瀵煎嚭Excel") @PostMapping("/exportExcel") @CloudRequiredPermission("business:userrel:exportExcel") - public void exportExcel (@RequestBody PageWrap<UserRel> pageWrap, HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + public void exportExcel (@RequestBody PageWrap<UserRel> pageWrap, HttpServletResponse response) { ExcelExporter.build(UserRel.class).export(userRelService.findPage(pageWrap).getRecords(), "浼氳瀹ょ鐞嗗憳鍜屽弬浼氫汉鍛樺叧鑱旇〃", response); } @ApiOperation("鏍规嵁ID鏌ヨ") @GetMapping("/{id}") @CloudRequiredPermission("business:userrel:query") - public ApiResponse findById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + public ApiResponse findById(@PathVariable Integer id) { return ApiResponse.success(userRelService.findById(id)); } } -- Gitblit v1.9.3