Merge branch 'tb-alipay' into test

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

@@ -508,7 +508,10 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @ApiOperation("集合查询")
     @Override
     public R<List<DeviceInfoDto.Vo>> list(DeviceInfoDto.ListDto dto) {
-        List<DeviceInfo> list = list(new LambdaQueryWrapper<DeviceInfo>().in(CollUtil.isNotEmpty(dto.getDeviceIds()), DeviceInfo::getDeviceId, dto.getDeviceIds()));
+        List<DeviceInfo> list = list(new LambdaQueryWrapper<DeviceInfo>()
+                .in(CollUtil.isNotEmpty(dto.getDeviceIds()), DeviceInfo::getDeviceId, dto.getDeviceIds())
+                .eq(Emptys.check(dto.getMercId()),DeviceInfo::getMercId,dto.getMercId())
+        );
         return R.ok(copy(DeviceInfoDto.Vo.class, list));
     }
 

device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -66,6 +66,9 @@ public class DeviceInfoDto {
     public static class ListDto {
         @ApiModelProperty(value = "设备id批量查")
         private List<Long> deviceIds;
+
+        @ApiModelProperty(value = "商户id")
+        private Long mercId;
     }
 
     @Data