商家端-订单分页 数据权限

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

@@ -68,7 +68,7 @@ public class MercPcDeviceController {
             if (CollUtil.isEmpty(mercDeviceIds)) {
                 return R.ok(new PageBean<>());
             }
-            page.setMyDeviceIds(mercDeviceIds);
+            page.setDeviceIdList(mercDeviceIds);
 
         }
         PageBean<DeviceInfoDto.Vo2> vo2PageBean = deviceService.queryPage(page);

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -811,7 +811,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         return R.ok();
     }
 
-    @ApiOperation("分页查询")
+    @ApiOperation("设备分页查询")
     @Override
     public R<PageBean<DeviceInfoDto.Vo2>> page(@RequestBody DeviceInfoDto.Page page) {
         return R.ok(queryPage(page));