提交merge1.3

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

@@ -1,10 +1,5 @@
-<<<<<<< HEAD
-ALTER TABLE med_medication_dispense ADD summary_no varchar(255) DEFAULT ''::character varying NULL;
-COMMENT ON COLUMN med_medication_dispense.summary_no IS '汇总编号';
-=======
 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 '汇总编号';
->>>>>>> v1.3
 
 
    -- 插入为tmp_activity_device表添加列的迁移记录