From dcdd2e21e6c5a000cbd0d6652b9d39d043638ec2 Mon Sep 17 00:00:00 2001 From: han0 Date: Fri, 15 Dec 2023 11:27:33 +0800 Subject: [PATCH] =?UTF-8?q?fix(task):=20=E4=BF=AE=E6=94=B9=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mjkf/xinke/main/controller/MaterialTaskController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java b/src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java index 96f0d03..478bfdc 100644 --- a/src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java +++ b/src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java @@ -6,6 +6,7 @@ import com.jgy.xxs.core.http.resp.HttpResponse; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import mjkf.xinke.auth.core.util.StpLoginUserUtil; +import mjkf.xinke.common.pojo.CommonResult; import mjkf.xinke.main.common.http.FuHttpResponse; import mjkf.xinke.main.model.db.MaterialTask; import mjkf.xinke.main.model.vo.MaterialTaskCreateRequest; @@ -32,7 +33,7 @@ public class MaterialTaskController { @ApiOperation("获取采集任务列表") @GetMapping("/") - public HttpResponse list( + public CommonResult> list( @ApiParam("每页数量") @RequestParam(name = "limit", defaultValue = "10") Integer limit, @ApiParam("页码") @RequestParam(name = "page", defaultValue = "1") Integer page, @ApiParam("任务类型") Integer type, @@ -47,7 +48,7 @@ public class MaterialTaskController { } var result = materialTaskService.page(new Page<>(page, limit), query); - return FuHttpResponse.Builder().pageResponse(result).build(); + return CommonResult.data(result); } @ApiOperation("创建采集任务列表")