提交merge1.3

迁移记录-DB变更记录/202510131411 add_column_adm_charge_item.sql

@@ -1,10 +1,5 @@
-<<<<<<< HEAD
-ALTER TABLE adm_charge_item ADD procedure_id int8 NULL;
-COMMENT ON COLUMN adm_charge_item.procedure_id IS '执行id';
-=======
 ALTER TABLE public.adm_charge_item ADD procedure_id int8 NULL;
 COMMENT ON COLUMN public.adm_charge_item.procedure_id IS '执行id';
->>>>>>> v1.3
 
 
    -- 插入为tmp_activity_device表添加列的迁移记录