Merge remote-tracking branch 'origin/master'

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<DevInfoVo> list = devInfoService.getDevList(devInfo);
         return AjaxResult.success(getDataTable(list));

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java

@@ -188,6 +188,6 @@ public interface DevInfoMapper {
 
     List<DevInfoVo> getTagDevList(DevInfoVo devInfoVo);
 
-    List<DevInfoVo> getDevList(DevInfo devInfo);
+    List<DevInfoVo> getDevList(DevInfoVo devInfo);
 }
 

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java

@@ -111,5 +111,5 @@ public interface DevInfoService {
 
     List<DevInfoVo> getTagDevList(DevInfoVo devInfoVo);
 
-    List<DevInfoVo> getDevList(DevInfo devInfo);
+    List<DevInfoVo> getDevList(DevInfoVo devInfo);
 }

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<DevInfoVo> getDevList(DevInfo devInfo) {
+    public List<DevInfoVo> getDevList(DevInfoVo devInfo) {
         return devInfoMapper.getDevList(devInfo);
     }