解决合并冲突

迁移记录-DB变更记录/202510131311 add_column_elep_medication_request.sql

@@ -0,0 +1,12 @@
+ALTER TABLE "public"."elep_medication_request" 
+  ADD COLUMN "condition_def_id" int8,
+  ADD COLUMN "opsp_dise_code" varchar(255);
+
+COMMENT ON COLUMN "public"."elep_medication_request"."condition_def_id" IS '诊断定义id';
+
+COMMENT ON COLUMN "public"."elep_medication_request"."opsp_dise_code" IS '慢病编码';
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510131311 add_column_elep_medication_request', '1.0.0');