解决合并冲突

2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
--- a/迁移记录-DB变更记录/202510211511
+++ b/迁移记录-DB变更记录/202510211511
@@ -0,0 +1,6 @@
+ALTER TABLE public.wor_supply_delivery ALTER COLUMN supplier_id DROP NOT NULL;
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510211511 alter_column_wor_supply_delivery', '1.0.0');