Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev
This commit is contained in:
commit
24321e01c1
|
@ -112,8 +112,6 @@ CREATE TABLE IF NOT EXISTS `system_parameter` (
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `test_resource` (
|
CREATE TABLE IF NOT EXISTS `test_resource` (
|
||||||
`id` varchar(50) NOT NULL COMMENT 'Test resource ID',
|
`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',
|
`description` varchar(255) DEFAULT NULL COMMENT 'Test resource description',
|
||||||
`configuration` longtext COMMENT 'Test resource configuration',
|
`configuration` longtext COMMENT 'Test resource configuration',
|
||||||
`status` varchar(64) NOT NULL COMMENT 'Test resource status',
|
`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` (
|
CREATE TABLE IF NOT EXISTS `test_resource_pool` (
|
||||||
`id` varchar(50) NOT NULL COMMENT 'Test resource pool ID',
|
`id` varchar(50) NOT NULL COMMENT 'Test resource pool ID',
|
||||||
`name` varchar(64) NOT NULL COMMENT 'Test resource pool name',
|
`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',
|
`description` varchar(255) DEFAULT NULL COMMENT 'Test resource pool description',
|
||||||
`status` varchar(64) NOT NULL COMMENT 'Test resource pool status',
|
`status` varchar(64) NOT NULL COMMENT 'Test resource pool status',
|
||||||
`create_time` bigint(13) NOT NULL COMMENT 'Create timestamp',
|
`create_time` bigint(13) NOT NULL COMMENT 'Create timestamp',
|
||||||
|
|
Loading…
Reference in New Issue