diff --git a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableField.java b/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableField.java index 4e3b27d2d7..b1c0654765 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableField.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableField.java @@ -69,7 +69,7 @@ public class CoreDatasetTableField implements Serializable { /** * 分组设置 */ - private String groups; + private String groupList; /** * 未分组的值 @@ -221,12 +221,12 @@ public class CoreDatasetTableField implements Serializable { this.fieldShortName = fieldShortName; } - public String getGroups() { - return groups; + public String getGroupList() { + return groupList; } - public void setGroups(String groups) { - this.groups = groups; + public void setGroupList(String groupList) { + this.groupList = groupList; } public String getOtherGroup() { @@ -354,7 +354,7 @@ public class CoreDatasetTableField implements Serializable { ", description = " + description + ", dataeaseName = " + dataeaseName + ", fieldShortName = " + fieldShortName + - ", groups = " + groups + + ", groupList = " + groupList + ", otherGroup = " + otherGroup + ", groupType = " + groupType + ", type = " + type + diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql index a91c0b2670..ac6b4f6858 100644 --- a/core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql +++ b/core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql @@ -1,5 +1,5 @@ ALTER TABLE `core_dataset_table_field` - ADD COLUMN `groups` longtext NULL; + ADD COLUMN `group_list` longtext NULL; ALTER TABLE `core_dataset_table_field` ADD COLUMN `other_group` longtext NULL; diff --git a/core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql index e25c8f1f76..801388fae4 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql @@ -1,5 +1,5 @@ ALTER TABLE `core_dataset_table_field` - ADD COLUMN `groups` longtext NULL COMMENT '分组设置' AFTER `field_short_name`; + ADD COLUMN `group_list` longtext NULL COMMENT '分组设置' AFTER `field_short_name`; ALTER TABLE `core_dataset_table_field` - ADD COLUMN `other_group` longtext NULL COMMENT '未分组的值' AFTER `groups`; + ADD COLUMN `other_group` longtext NULL COMMENT '未分组的值' AFTER `group_list`;