提交merge1.3

This commit is contained in:
2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions

View File

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