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

+<<<<<<< HEAD
   ALTER TABLE "wor_service_request" 
   ADD COLUMN "parent_id" int8  DEFAULT NULL;
   COMMENT ON COLUMN "wor_service_request"."parent_id" IS '父id(适用诊疗套餐)';
+=======
+   ALTER TABLE "public"."wor_service_request" 
+   ADD COLUMN "parent_id" int8  DEFAULT NULL;
+   COMMENT ON COLUMN "public"."wor_service_request"."parent_id" IS '父id(适用诊疗套餐)';
+>>>>>>> v1.3
   
   -- 插入为wor_service_request表添加列的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)