提交merge1.3

This commit is contained in:
2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions

View File

@@ -1,3 +1,4 @@
<<<<<<< HEAD
ALTER TABLE "elep_medication_request"
ADD COLUMN "condition_def_id" int8,
ADD COLUMN "opsp_dise_code" varchar(255);
@@ -5,6 +6,15 @@ ALTER TABLE "elep_medication_request"
COMMENT ON COLUMN "elep_medication_request"."condition_def_id" IS '诊断定义id';
COMMENT ON COLUMN "elep_medication_request"."opsp_dise_code" IS '慢病编码';
=======
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 '慢病编码';
>>>>>>> v1.3
-- 插入为tmp_activity_device表添加列的迁移记录