解决合并冲突

迁移记录-DB变更记录/202509191411 add_column_tmp_activity_device.sql

@@ -0,0 +1,7 @@
+   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 '单位';
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509191411 add_column_tmp_activity_device', '1.0.0');