Merge remote-tracking branch 'refs/remotes/origin/dev-1.0' into dev-1.1

# Conflicts:
#	src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceServiceImpl.java

src/main/resources/db/migration/V1.0.01__INIT_TABLES.sql

@@ -450,6 +450,7 @@ CREATE TABLE `workspace` (
     `name` varchar(256) NOT NULL DEFAULT '' COMMENT '名称',
     `tags` varchar(256) NOT NULL DEFAULT '' COMMENT '标签,多个逗号分隔',
     `visibility` varchar(16) NOT NULL DEFAULT 'private' COMMENT '可见程度,可选值：private，public 默认：private',
+    `properties` varchar(256) NOT NULL DEFAULT '' COMMENT '属性',
     `description` text NOT NULL DEFAULT '' COMMENT '描述信息',
     `create_timestamp` bigint(20) NOT NULL COMMENT '创建时间戳',
     `update_timestamp` bigint(20) NOT NULL COMMENT '更新时间戳',