From 3a383bb5469b2995802c4040f44e05bdbf582ad8 Mon Sep 17 00:00:00 2001
From: W23123 <1021720039@qq.com>
Date: Tue, 24 Mar 2020 16:54:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=B1=A0=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20flyway?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/db/migration/V2__metersphere_ddl.sql    | 3 +--
 .../business/components/settings/system/TestResourcePool.vue   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql b/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql
index 910c0fed68..e3a1a0935c 100644
--- a/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql
+++ b/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql
@@ -112,8 +112,6 @@ CREATE TABLE IF NOT EXISTS `system_parameter` (
 
 CREATE TABLE IF NOT EXISTS `test_resource` (
     `id`                    varchar(50) NOT NULL COMMENT 'Test resource ID',
-    `test_resource_pool_id` varchar(50) NOT NULL COMMENT 'Test resource pool ID this test resource belongs to',
-    `name`                  varchar(64) NOT NULL COMMENT 'Test resource name',
     `description`           varchar(255) DEFAULT NULL COMMENT 'Test resource description',
     `configuration`         longtext COMMENT 'Test resource configuration',
     `status`                varchar(64) NOT NULL COMMENT 'Test resource status',
@@ -128,6 +126,7 @@ CREATE TABLE IF NOT EXISTS `test_resource` (
 CREATE TABLE IF NOT EXISTS `test_resource_pool` (
     `id`          varchar(50) NOT NULL COMMENT 'Test resource pool ID',
     `name`        varchar(64) NOT NULL COMMENT 'Test resource pool name',
+    `type`        varchar(30) NOT NULL COMMENT 'Test resource pool type',
     `description` varchar(255) DEFAULT NULL COMMENT 'Test resource pool description',
     `status`      varchar(64) NOT NULL COMMENT 'Test resource pool status',
     `create_time` bigint(13)  NOT NULL COMMENT 'Create timestamp',
diff --git a/frontend/src/business/components/settings/system/TestResourcePool.vue b/frontend/src/business/components/settings/system/TestResourcePool.vue
index d11c885974..d308f16151 100644
--- a/frontend/src/business/components/settings/system/TestResourcePool.vue
+++ b/frontend/src/business/components/settings/system/TestResourcePool.vue
@@ -32,7 +32,7 @@
                        @change="changeSwitch(scope.row)"
             />
           </template>
-        </el-table-column>
+        </el-table-column>changeSwitch
         <el-table-column prop="createTime" label="创建时间" width="180">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime | timestampFormatDate }}</span>

From 9d2e70bf0e6adf1a5686ad3afe520dac80a5e0a2 Mon Sep 17 00:00:00 2001
From: W23123 <1021720039@qq.com>
Date: Tue, 24 Mar 2020 16:55:39 +0800
Subject: [PATCH 2/2] =?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

---
 .../business/components/settings/system/TestResourcePool.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/settings/system/TestResourcePool.vue b/frontend/src/business/components/settings/system/TestResourcePool.vue
index d308f16151..d11c885974 100644
--- a/frontend/src/business/components/settings/system/TestResourcePool.vue
+++ b/frontend/src/business/components/settings/system/TestResourcePool.vue
@@ -32,7 +32,7 @@
                        @change="changeSwitch(scope.row)"
             />
           </template>
-        </el-table-column>changeSwitch
+        </el-table-column>
         <el-table-column prop="createTime" label="创建时间" width="180">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime | timestampFormatDate }}</span>