提交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变更记录/202509191411
+++ b/迁移记录-DB变更记录/202509191411
@@ -1,6 +1,12 @@
+<<<<<<< HEAD
   ALTER TABLE "tmp_activity_device" 
   ADD COLUMN "unit_code" varchar(3) COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
   COMMENT ON COLUMN "tmp_activity_device"."unit_code" IS '单位';
+=======
+   ALTER TABLE "public"."tmp_activity_device" 
+   ADD COLUMN "unit_code" varchar(3) COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
+   COMMENT ON COLUMN "public"."tmp_activity_device"."unit_code" IS '单位';
+>>>>>>> v1.3

   -- 插入为tmp_activity_device表添加列的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)