解决合并冲突

2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
--- a/迁移记录-DB变更记录/202509261212
+++ b/迁移记录-DB变更记录/202509261212
@@ -0,0 +1,13 @@
+ALTER TABLE "public"."doc_statistics_definition" 
+  ADD COLUMN "dict_name" varchar(50),
+  ADD COLUMN "dict_type" varchar(50);
+
+COMMENT ON COLUMN "public"."doc_statistics_definition"."dict_name" IS '字典名称';
+
+COMMENT ON COLUMN "public"."doc_statistics_definition"."dict_type" IS '字典类型';
+
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509261212 add_column _doc_statistics_definition', '1.0.0');