#MOD

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

@@ -303,7 +303,6 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @Transactional(rollbackFor = Exception.class)
     public R<Boolean> mercDeviceAuth(DeviceInfoDto.MercDeviceAuthDto auth) {
         Long mercId = auth.getMercId();
-        Long parentId = auth.getParentId();
         String mercCode = auth.getMercCode();
         Long algorithmId = auth.getAlgorithmId();
         String mercName = auth.getMercName();
@@ -315,7 +314,6 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             if (CollUtil.isEmpty(devices)) {
                 return R.ok(Boolean.TRUE);
             }
-            return R.ok(removeMerRefDevices(devices, parentId));
         }
         //更新商户设备授权
         List<DeviceInfo> deviceInfos = this.listByIds(deviceIds);