From 1bfec53e4e3a196a3ca53e06e9bec88139cbb689 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 24 一月 2024 18:06:40 +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..3f29c37 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,16 +77,16 @@
@ApiOperation("鍒楄〃鏌ヨ")
@PostMapping("/list")
@RequiresPermissions("business:solutions:query")
- public ApiResponse<List<Solutions>> findList (@RequestBody Solutions pageWrap) {
- return ApiResponse.success(solutionsService.findList(pageWrap));
- }
-
- @ApiOperation("鍒楄〃鏌ヨ")
- @PostMapping("/page")
- public ApiResponse<List<Solutions>> findPage (@RequestBody Solutions solutions) {
+ public ApiResponse<List<Solutions>> findList (@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")
@RequiresPermissions("business:solutions:exportExcel")
--
Gitblit v1.9.3