解决合并冲突

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

@@ -0,0 +1,7 @@
+ALTER TABLE public.adm_charge_item ADD procedure_id int8 NULL;
+COMMENT ON COLUMN public.adm_charge_item.procedure_id IS '执行id';
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510131411 add_column_adm_charge_item', '1.0.0');