diff --git a/nl-module-base/nl-module-base-server/src/main/java/cn/code/nl/module/base/dal/dataobject/codegen/CodeRuleDO.java b/nl-module-base/nl-module-base-server/src/main/java/cn/code/nl/module/base/dal/dataobject/codegen/CodeRuleDO.java index b8a9fb4d..d367f472 100644 --- a/nl-module-base/nl-module-base-server/src/main/java/cn/code/nl/module/base/dal/dataobject/codegen/CodeRuleDO.java +++ b/nl-module-base/nl-module-base-server/src/main/java/cn/code/nl/module/base/dal/dataobject/codegen/CodeRuleDO.java @@ -46,6 +46,7 @@ public class CodeRuleDO extends BaseDO { /** * 分隔符 */ + @TableField("code_separator") private String separator; /** diff --git a/sql/mysql/add26071501.sql b/sql/mysql/add26071501.sql index 98e454c1..b4b4a116 100644 --- a/sql/mysql/add26071501.sql +++ b/sql/mysql/add26071501.sql @@ -4,7 +4,7 @@ CREATE TABLE base_code_rule ( rule_name VARCHAR(64) NOT NULL COMMENT '规则名称', rule_code VARCHAR(32) NOT NULL COMMENT '规则编码(唯一标识,调用时传入)', segment_config JSON NOT NULL COMMENT '分段配置(JSON数组)', - separator VARCHAR(8) DEFAULT '' COMMENT '分隔符(- / _ . 或空)', + code_separator VARCHAR(8) DEFAULT '' COMMENT '分隔符(- / _ . 或空)', letter_case TINYINT DEFAULT 0 COMMENT '字母大小写:0=原样 1=全大写 2=全小写', total_length INT DEFAULT 0 COMMENT '固定总长度约束(0=不限制)', seq_strategy VARCHAR(16) DEFAULT 'segment' COMMENT '序号策略:segment=号段预分配 lock=分布式锁实时', @@ -43,3 +43,6 @@ INSERT INTO `system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id INSERT INTO `system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (6747, '编码规则新增', 'base:code-rule:create', 3, 2, 6745, '', NULL, NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'); INSERT INTO `system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (6748, '编码规则修改', 'base:code-rule:update', 3, 3, 6745, '', NULL, NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'); INSERT INTO `system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (6749, '编码规则删除', 'base:code-rule:delete', 3, 4, 6745, '', NULL, NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'); + +-- 如果已建表且列名为 separator,执行此语句修复保留关键字问题 +-- ALTER TABLE base_code_rule CHANGE COLUMN separator code_separator VARCHAR(8) DEFAULT '' COMMENT '分隔符(- / _ . 或空)';