From c208f0705aefab4c910580ac8c7b4833a41f7dde Mon Sep 17 00:00:00 2001
From: W23123 <1021720039@qq.com>
Date: Tue, 24 Mar 2020 16:14:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=B1=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/controller/TestResourcePoolController.java   | 2 +-
 .../business/components/settings/system/TestResourcePool.vue    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/controller/TestResourcePoolController.java b/backend/src/main/java/io/metersphere/controller/TestResourcePoolController.java
index efe56fd502..dfd79466f6 100644
--- a/backend/src/main/java/io/metersphere/controller/TestResourcePoolController.java
+++ b/backend/src/main/java/io/metersphere/controller/TestResourcePoolController.java
@@ -42,7 +42,7 @@ public class TestResourcePoolController {
     }
 
     @GetMapping("list/all")
-    public List<TestResourcePool> listResourcePools() {
+    public List<TestResourcePoolDTO> listResourcePools() {
         PageHelper.startPage(1, 10000, true);
         QueryResourcePoolRequest request = new QueryResourcePoolRequest();
         return testResourcePoolService.listResourcePools(request);
diff --git a/frontend/src/business/components/settings/system/TestResourcePool.vue b/frontend/src/business/components/settings/system/TestResourcePool.vue
index c166be6f73..d11c885974 100644
--- a/frontend/src/business/components/settings/system/TestResourcePool.vue
+++ b/frontend/src/business/components/settings/system/TestResourcePool.vue
@@ -334,8 +334,6 @@
         this.createVisible = true;
       },
       edit(row) {
-        window.console.log(row);
-        // this.loading = true;
         this.updateVisible = true;
         this.form = JSON.parse(JSON.stringify(row));
         this.convertResources();