Merge remote-tracking branch 'origin/master'

jiangping

2024-02-02 f8b1073fbb28d37e08016eed32c682f8c5eae391

 server/company/src/main/java/com/doumee/api/business/SolutionsController.java

@@ -67,18 +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 (@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("导出Excel")
    @PostMapping("/exportExcel")
@@ -93,4 +100,5 @@
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(solutionsService.findById(id));
    }

}