|
|
@@ -684,7 +684,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
//1、删除设备商品
|
|
|
GoodsDeviceDto.DelByDeviceId delByDeviceId = new GoodsDeviceDto.DelByDeviceId();
|
|
|
delByDeviceId.setDeviceId(deviceId);
|
|
|
- delByDeviceId.setMercId(delByDeviceId.getMercId());
|
|
|
+// delByDeviceId.setMercId(delByDeviceId.getMercId());
|
|
|
R.feignCheckData(goodsDeviceService.delByDeviceId(delByDeviceId));
|
|
|
}
|
|
|
if (algorithmId != null && Objects.equals(AlgorithmTypeEnum.CLOUD.getId(), algorithmId)) {
|
