解决合并冲突

迁移记录-DB变更记录/202511031515 add_column adm_charge_item.sql

@@ -0,0 +1,8 @@
+ALTER TABLE public.adm_charge_item ADD dispense_table varchar(255) DEFAULT ''::character varying NULL;
+COMMENT ON COLUMN public.adm_charge_item.dispense_table IS '发放所在表';
+
+ALTER TABLE public.adm_charge_item ADD dispense_id int8 NULL;
+COMMENT ON COLUMN public.adm_charge_item.dispense_id IS '发放ID';
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202511031515 add_column adm_charge_item', '1.0.0');