提交merge1.3

This commit is contained in:
2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions

View File

@@ -1,13 +1,3 @@
<<<<<<< HEAD
ALTER TABLE med_medication_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
COMMENT ON COLUMN med_medication_request.generate_source_enum IS '生成来源';
ALTER TABLE wor_device_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
COMMENT ON COLUMN wor_device_request.generate_source_enum IS '生成来源';
ALTER TABLE wor_service_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
COMMENT ON COLUMN wor_service_request.generate_source_enum IS '生成来源';
=======
ALTER TABLE public.med_medication_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
COMMENT ON COLUMN public.med_medication_request.generate_source_enum IS '生成来源';
@@ -16,7 +6,6 @@
ALTER TABLE public.wor_service_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
COMMENT ON COLUMN public.wor_service_request.generate_source_enum IS '生成来源';
>>>>>>> v1.3
-- 插入为tmp_activity_device表添加列的迁移记录
INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)