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 |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 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 9a7aab9..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
@@ -20,7 +20,7 @@
 
 /**
  * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
  */
 @Api(tags = "淇濋櫓鏂规淇℃伅琛�")
 @RestController
@@ -67,12 +67,25 @@
         return ApiResponse.success(null);
     }
 
-    @ApiOperation("鍒嗛〉鏌ヨ")
+    @ApiOperation("銆愬钩鍙扮銆戝垎椤垫煡璇�")
     @PostMapping("/page")
     @RequiresPermissions("business:solutions:query")
     public ApiResponse<PageData<Solutions>> findPage (@RequestBody PageWrap<Solutions> pageWrap) {
         return ApiResponse.success(solutionsService.findPage(pageWrap));
     }
+
+    @ApiOperation("鍒楄〃鏌ヨ")
+    @PostMapping("/list")
+    @RequiresPermissions("business:solutions:query")
+    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("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
@@ -87,4 +100,5 @@
     public ApiResponse findById(@PathVariable Integer id) {
         return ApiResponse.success(solutionsService.findById(id));
     }
+
 }

--
Gitblit v1.9.3