Merge remote-tracking branch 'origin/master' into test

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

@@ -1189,6 +1189,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         QueryWrapper<DeviceInfo> queryWrapper = new MybatisPlusQuery().eqWrapper(vo == null ? new DeviceInfoDto.Vo() : vo, DeviceInfo.class).buildQW();
 //        List<Long> placeLineIds = dto.getPlaceLineIds();
         List<Long> deviceIds = dto.getDeviceIds();
+        List<Long> mercIds = dto.getMercIds();
         List<String> columnList = dto.getColumnList();
 //        if (CollUtil.isNotEmpty(placeLineIds)) {
 //            queryWrapper.in(LambdaUtils.getUnderlineCaseName(DeviceInfo::getPlaceLineId), placeLineIds);
@@ -1207,6 +1208,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         if (CollUtil.isNotEmpty(deviceIds)) {
             queryWrapper.in(LambdaUtils.getUnderlineCaseName(DeviceInfo::getDeviceId), deviceIds);
         }
+        if (CollUtil.isNotEmpty(mercIds)) {
+            queryWrapper.in(LambdaUtils.getUnderlineCaseName(DeviceInfo::getMercId), mercIds);
+        }
         return R.ok(copy(DeviceInfoDto.Vo.class, list(queryWrapper)));
     }
 

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

@@ -430,8 +430,10 @@ public class DeviceInfoDto {
 //        @ApiModelProperty("线路id多个")
 //        private List<Long> placeLineIds;
 
-        @ApiModelProperty("id")
+        @ApiModelProperty("设备ID")
         private List<Long> deviceIds;
+        @ApiModelProperty("商户ID")
+        private List<Long> mercIds;
 
 
         @ApiModelProperty("指定字段查询")