解决合并冲突

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

@@ -0,0 +1,7 @@
+   ALTER TABLE "public"."wor_service_request" 
+  ADD COLUMN "rate_code" varchar(255) COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
+   COMMENT ON COLUMN "public"."wor_service_request"."rate_code" IS '用药频次';
+   
+   -- 插入添加wor_service_request列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509041015add_column_wor_service_request', '1.0.0');