提交merge1.3

This commit is contained in:
2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions

View File

@@ -1,9 +1,18 @@
<<<<<<< HEAD
ALTER TABLE med_medication_definition ADD dosage_instruction varchar(255) NULL;
COMMENT ON COLUMN med_medication_definition.dosage_instruction IS '用药说明';
ALTER TABLE med_medication_request ADD dosage_instruction varchar(255) NULL;
COMMENT ON COLUMN med_medication_request.dosage_instruction IS '用药说明';
=======
ALTER TABLE public.med_medication_definition ADD dosage_instruction varchar(255) NULL;
COMMENT ON COLUMN public.med_medication_definition.dosage_instruction IS '用药说明';
ALTER TABLE public.med_medication_request ADD dosage_instruction varchar(255) NULL;
COMMENT ON COLUMN public.med_medication_request.dosage_instruction IS '用药说明';
>>>>>>> v1.3
-- 插入为tmp_activity_device表添加列的迁移记录