解决合并冲突

迁移记录-DB变更记录/202509101030add_column_wor_service_request.sql

@@ -0,0 +1,8 @@
+
+   ALTER TABLE "public"."wor_service_request" 
+   ADD COLUMN "parent_id" int8  DEFAULT NULL;
+   COMMENT ON COLUMN "public"."wor_service_request"."parent_id" IS '父id(适用诊疗套餐)';
+   
+   -- 插入为wor_service_request表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509101030add_column_wor_service_request', '1.0.0');