提交merge1.3

迁移记录-DB变更记录/202510211511 alter_column_wor_supply_delivery.sql

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-ALTER TABLE wor_supply_delivery ALTER COLUMN supplier_id DROP NOT NULL;
-=======
 ALTER TABLE public.wor_supply_delivery ALTER COLUMN supplier_id DROP NOT NULL;
->>>>>>> v1.3
 
 
    -- 插入为tmp_activity_device表添加列的迁移记录