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/SolutionsController.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/company/src/main/java/com/doumee/api/business/SolutionsController.java b/server/company/src/main/java/com/doumee/api/business/SolutionsController.java index 26228ba..7e4c700 100644 --- a/server/company/src/main/java/com/doumee/api/business/SolutionsController.java +++ b/server/company/src/main/java/com/doumee/api/business/SolutionsController.java @@ -77,15 +77,15 @@ @ApiOperation("鍒楄〃鏌ヨ") @PostMapping("/list") @RequiresPermissions("business:solutions:query") - public ApiResponse<List<Solutions>> findList (@RequestBody Solutions pageWrap) { - return ApiResponse.success(solutionsService.findList(pageWrap)); + public ApiResponse<List<Solutions>> findList () { + return ApiResponse.success(solutionsService.findListForCompany()); } - @ApiOperation("鍒楄〃鏌ヨ") - @PostMapping("/page") - public ApiResponse<List<Solutions>> findPage (@RequestBody Solutions solutions) { - return ApiResponse.success(solutionsService.findList(solutions)); - } +// @ApiOperation("鍒楄〃鏌ヨ") +// @PostMapping("/page") +// public ApiResponse<List<Solutions>> findPage (@RequestBody Solutions solutions) { +// return ApiResponse.success(solutionsService.findList(solutions)); +// } @ApiOperation("瀵煎嚭Excel") @PostMapping("/exportExcel") -- Gitblit v1.9.3