diff --git a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java
index b5e89d58..c445ad74 100644
--- a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java
+++ b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java
@@ -177,7 +177,7 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager {
 
         if (tDev.getDevCapacity().size() != 0) {
             tDev.getDevCapacity().forEach(v -> {
-                v.setDeviceId(dev.getId());
+                v.setDeviceId(devId);
                 if (v.getIpType() == null) {
                     v.setIpType(IpAddrType.IPV4_IPV6);
                 }
diff --git a/src/main/java/com/dispose/service/impl/DisposeTaskServiceImpl.java b/src/main/java/com/dispose/service/impl/DisposeTaskServiceImpl.java
index 62b23978..5ea30ce1 100644
--- a/src/main/java/com/dispose/service/impl/DisposeTaskServiceImpl.java
+++ b/src/main/java/com/dispose/service/impl/DisposeTaskServiceImpl.java
@@ -100,6 +100,7 @@ public class DisposeTaskServiceImpl implements DisposeTaskService {
      *
      * @return the dispose task list
      */
+    @Override
     public List<DisposeTask> getAllDisposeTask() {
         return disposeTaskManager.getDisposeTasks();
     }