Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java

@@ -3,6 +3,7 @@ package com.bonus.material.device.controller;
 import cn.hutool.core.convert.Convert;
 import com.bonus.common.biz.config.ListPagingUtil;
 import com.bonus.common.biz.domain.BmCompanyInfo;
+import com.bonus.common.core.constant.Constants;
 import com.bonus.common.core.utils.ServletUtils;
 import com.bonus.common.core.utils.poi.ExcelUtil;
 import com.bonus.common.core.web.controller.BaseController;
@@ -23,8 +24,6 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
-import static com.bonus.common.core.web.page.TableSupport.PAGE_NUM;
-import static com.bonus.common.core.web.page.TableSupport.PAGE_SIZE;
 
 /**
  * 设备信息Controller
@@ -33,7 +32,6 @@ import static com.bonus.common.core.web.page.TableSupport.PAGE_SIZE;
  */
 @RestController
 @RequestMapping("/dev")
-@Validated
 @Api(value = "设备信息",tags = "设备管理")
 public class DevInfoController extends BaseController {
 
@@ -70,8 +68,8 @@ public class DevInfoController extends BaseController {
      */
     //@RequiresPermissions("equip:info:list")
     @ApiOperation(value = "查询装备列表--分页")
-    @PostMapping("/devList")
+    @GetMapping("/devList")
-    public TableDataInfo devList(@RequestBody DevInfoVo devInfo) {
+    public TableDataInfo devList(DevInfoVo devInfo) {
         startPage();
         List<DevInfoVo> list = devInfoService.selectDevInfoLists(devInfo);
         return getDataTable(list);