提交merge1.3

2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
--- a/迁移记录-DB变更记录/202510211511
+++ b/迁移记录-DB变更记录/202510211511
@@ -1,4 +1,8 @@
+<<<<<<< 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表添加列的迁移记录