提交merge1.3

This commit is contained in:
2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions

View File

@@ -1,22 +1,3 @@
<<<<<<< HEAD
ALTER TABLE wor_device_request ADD based_on_table varchar(255) NULL;
COMMENT ON COLUMN wor_device_request.based_on_table IS '请求基于什么';
ALTER TABLE wor_device_request ADD based_on_id int8 NULL;
COMMENT ON COLUMN wor_device_request.based_on_id IS '请求基于什么的ID';
ALTER TABLE wor_device_dispense ADD procedure_id int8 NULL;
COMMENT ON COLUMN wor_device_dispense.procedure_id IS '执行id';
ALTER TABLE med_medication_request ADD based_on_table varchar(255) NULL;
COMMENT ON COLUMN med_medication_request.based_on_table IS '请求基于什么';
ALTER TABLE med_medication_request ADD based_on_id int8 NULL;
COMMENT ON COLUMN med_medication_request.based_on_id IS '请求基于什么的ID';
ALTER TABLE med_medication_dispense ADD procedure_id int8 NULL;
COMMENT ON COLUMN med_medication_dispense.procedure_id IS '执行id';
=======
ALTER TABLE public.wor_device_request ADD based_on_table varchar(255) NULL;
COMMENT ON COLUMN public.wor_device_request.based_on_table IS '请求基于什么';
@@ -34,7 +15,6 @@ COMMENT ON COLUMN public.med_medication_request.based_on_id IS '请求基于什
ALTER TABLE public.med_medication_dispense ADD procedure_id int8 NULL;
COMMENT ON COLUMN public.med_medication_dispense.procedure_id IS '执行id';
>>>>>>> v1.3
-- 插入为tmp_activity_device表添加列的迁移记录