解决合并冲突

迁移记录-DB变更记录/202509161311 add_column_cli_reservation_record.sql

@@ -0,0 +1,8 @@
+
+    ALTER TABLE "public"."cli_reservation_record" 
+   ADD COLUMN "tooth_position" varchar(500) COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
+   COMMENT ON COLUMN "public"."cli_reservation_record"."tooth_position" IS '牙位';
+
+   -- 插入为cli_reservation_record表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509161311 add_column_cil_reservation_record', '1.0.0');