解决合并冲突

迁移记录-DB变更记录/202511061215 ALTER TABLE sys_oper_log.sql

@@ -0,0 +1,6 @@
+ALTER TABLE sys_oper_log ALTER COLUMN oper_param TYPE text;
+ALTER TABLE sys_oper_log ALTER COLUMN json_result TYPE text;
+ALTER TABLE sys_oper_log ALTER COLUMN error_msg TYPE text;
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202511061215 ALTER TABLE sys_oper_log', '1.0.0');