提交merge1.3

2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
--- a/迁移记录-DB变更记录/202511031415
+++ b/迁移记录-DB变更记录/202511031415
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
-ALTER TABLE tmp_orders_group_package_detail ADD group_id int8 NULL;
-COMMENT ON COLUMN tmp_orders_group_package_detail.group_id IS '组号';
-=======
 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 '组号';
->>>>>>> v1.3
   -- 插入为tmp_activity_device表添加列的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
 VALUES ('202511031415 add_column tmp_orders_group_package_detail', '1.0.0');