Merge remote-tracking branch 'origin/master'

jiangping

2024-01-31 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa

 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")