Merge branch 'master' into test

device-api-service-merc-mini/src/main/java/com/xy/controller/DeviceSimController.java

@@ -23,12 +23,12 @@ public class DeviceSimController {
     @PostMapping("page")
     @ApiOperation("分页查询")
     public R<PageBean<DeviceSimDto.PageVo>> page(@RequestBody DeviceSimDto.Page page) {
-        return deviceSimService.page(page.setMercId(MercAuthUtils.getMercId()).setIsActivate(true));
+        return deviceSimService.page(page.setMercId(MercAuthUtils.getMercId()));
     }
 
     @PostMapping("pageCount")
     @ApiOperation("分页数量查询")
     public R<DeviceSimDto.PageCountVo> pageCount(@RequestBody @Validated DeviceSimDto.PageCount pageCount) {
-        return deviceSimService.pageCount(pageCount.setMercId(MercAuthUtils.getMercId()).setIsActivate(true));
+        return deviceSimService.pageCount(pageCount.setMercId(MercAuthUtils.getMercId()));
     }
 }