From c95b9c33045fe5c0486190abce53decfb1b9e02e Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 18 Dec 2024 13:57:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2-=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comprehensive/controller/ComprehensiveController.java | 2 +- .../java/com/bonus/material/device/mapper/DevInfoMapper.java | 2 +- .../java/com/bonus/material/device/service/DevInfoService.java | 2 +- .../bonus/material/device/service/impl/DevInfoServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/comprehensive/controller/ComprehensiveController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/comprehensive/controller/ComprehensiveController.java index ab2151b..0096ce2 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/comprehensive/controller/ComprehensiveController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/comprehensive/controller/ComprehensiveController.java @@ -27,7 +27,7 @@ public class ComprehensiveController extends BaseController { private DevInfoService devInfoService; @ApiOperation(value = "综合查询-装备信息") @GetMapping("/devList") - public AjaxResult getDevList(DevInfo devInfo) { + public AjaxResult getDevList(DevInfoVo devInfo) { startPage(); List list = devInfoService.getDevList(devInfo); return AjaxResult.success(getDataTable(list)); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java index d314c4e..b7d68c4 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java @@ -188,6 +188,6 @@ public interface DevInfoMapper { List getTagDevList(DevInfoVo devInfoVo); - List getDevList(DevInfo devInfo); + List getDevList(DevInfoVo devInfo); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java index f284f1c..99c38c7 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java @@ -111,5 +111,5 @@ public interface DevInfoService { List getTagDevList(DevInfoVo devInfoVo); - List getDevList(DevInfo devInfo); + List getDevList(DevInfoVo devInfo); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index 62b71f7..7b0095b 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -760,7 +760,7 @@ public class DevInfoServiceImpl implements DevInfoService { } @Override - public List getDevList(DevInfo devInfo) { + public List getDevList(DevInfoVo devInfo) { return devInfoMapper.getDevList(devInfo); }