Merge branch 'master' into test

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

@@ -1076,6 +1076,10 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 }
                 // 清理点位
                 deviceInfo.setPlaceId(-1L);
+                //删除设备商品
+                GoodsDeviceDto.DelByDeviceId delByDeviceId = new GoodsDeviceDto.DelByDeviceId();
+                delByDeviceId.setDeviceId(deviceInfo.getDeviceId());
+                R.feignCheckData(goodsDeviceService.delByDeviceId(delByDeviceId));
             });
             // 批量更新
             return updateBatchById(deviceInfos);