解决合并冲突

2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
--- a/迁移记录-DB变更记录/202511031415
+++ b/迁移记录-DB变更记录/202511031415
@@ -0,0 +1,5 @@
+ALTER TABLE public.tmp_orders_group_package_detail ADD group_id int8 NULL;
+COMMENT ON COLUMN public.tmp_orders_group_package_detail.group_id IS '组号';
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202511031415 add_column tmp_orders_group_package_detail', '1.0.0');