提交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变更记录/202509161311
+++ b/迁移记录-DB变更记录/202509161311
@@ -1,7 +1,13 @@

+<<<<<<< HEAD
    ALTER TABLE "cli_reservation_record" 
   ADD COLUMN "tooth_position" varchar(500) COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
   COMMENT ON COLUMN "cli_reservation_record"."tooth_position" IS '牙位';
+=======
+    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 '牙位';
+>>>>>>> v1.3

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