Merge branch 'hcp' into test

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

@@ -589,12 +589,12 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         String deviceSearch = dto.getDeviceSearch();
         DeviceInfoDto.Vo vo = dto.getVo();
         QueryWrapper<DeviceInfo> queryWrapper = new MybatisPlusQuery().eqWrapper(vo == null ? new DeviceInfoDto.Vo() : vo, DeviceInfo.class).buildQW();
-        List<Long> placeLineIds = dto.getPlaceLineIds();
+//        List<Long> placeLineIds = dto.getPlaceLineIds();
         List<Long> deviceIds = dto.getDeviceIds();
         List<String> columnList = dto.getColumnList();
-        if (CollUtil.isNotEmpty(placeLineIds)) {
-            queryWrapper.in(LambdaUtils.getUnderlineCaseName(DeviceInfo::getPlaceLineId), placeLineIds);
-        }
+//        if (CollUtil.isNotEmpty(placeLineIds)) {
+//            queryWrapper.in(LambdaUtils.getUnderlineCaseName(DeviceInfo::getPlaceLineId), placeLineIds);
+//        }
 
         //fixed
         if (StrUtil.isNotEmpty(deviceSearch)) {

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

@@ -109,8 +109,8 @@ public class DeviceInfoDto {
     public static class ListCommon {
         @ApiModelProperty("设备信息VO")
         Vo vo;
-        @ApiModelProperty("线路id多个")
-        private List<Long> placeLineIds;
+//        @ApiModelProperty("线路id多个")
+//        private List<Long> placeLineIds;
 
         @ApiModelProperty("id")
         private List<Long> deviceIds;