解决合并冲突

This commit is contained in:
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions

View File

@@ -0,0 +1,33 @@
CREATE TABLE PUBLIC.cli_condition_no_definition (
gl_no VARCHAR (255) NULL,
id bigserial NOT NULL,
tenant_id INT8 NULL,
delete_flag BPCHAR DEFAULT '0' NULL,
create_by VARCHAR (32) NULL,
create_time TIMESTAMPTZ (6) NULL,
update_by VARCHAR (32) NULL,
update_time TIMESTAMPTZ (6) NULL,
gl_name VARCHAR (255) NULL,
icd10_no VARCHAR (255) NULL,
icd10_name VARCHAR (255) NULL
);
COMMENT ON TABLE PUBLIC.cli_condition_no_definition IS '诊断各种编码定义表';
-- Column comments
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.gl_no IS '国临疾病编码';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.id IS 'ID';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.tenant_id IS '租户id';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.delete_flag IS '删除状态';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.create_by IS '创建人';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.create_time IS '创建时间';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.update_by IS '更新人';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.update_time IS '更新时间';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.gl_name IS '国临疾病名称';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.icd10_no IS 'icd10编码';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.icd10_name IS 'icd10名称';
-- 插入为tmp_activity_device表添加列的迁移记录
INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
VALUES ('202510151413 add_talble_cli_condition_no_definition', '1.0.0');