解决合并冲突

迁移记录-DB变更记录/202510211414 add_column_med_medication_dispense.sql

@@ -0,0 +1,7 @@
+ALTER TABLE public.med_medication_dispense ADD summary_no varchar(255) DEFAULT ''::character varying NULL;
+COMMENT ON COLUMN public.med_medication_dispense.summary_no IS '汇总编号';
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510211414 add_column_med_medication_dispense', '1.0.0');