解决合并冲突

2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
--- a/med_medication_definition&med_medication_request.sql
+++ b/med_medication_definition&med_medication_request.sql
@@ -0,0 +1,11 @@
+		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 '用药说明';
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510271011 add_column_ med_medication_definition&med_medication_request', '1.0.0');