提交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变更记录/202509101025add_column_adm_practitioner.sql
+++ b/迁移记录-DB变更记录/202509101025add_column_adm_practitioner.sql
@@ -1,6 +1,12 @@
+<<<<<<< HEAD
   ALTER TABLE "adm_practitioner" 
   ADD COLUMN "signature" text COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
   COMMENT ON COLUMN "adm_practitioner"."signature" IS '签名图片';
+=======
+   ALTER TABLE "public"."adm_practitioner" 
+   ADD COLUMN "signature" text COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
+   COMMENT ON COLUMN "public"."adm_practitioner"."signature" IS '签名图片';
+>>>>>>> v1.3
   
   -- 插入为adm_practitioner表添加列的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)