解决合并冲突

2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
--- a/add_column_tmp_orders_group_package_detail.sql
+++ b/add_column_tmp_orders_group_package_detail.sql
@@ -0,0 +1,20 @@
+
+ALTER TABLE public.tmp_orders_group_package_detail ADD dose numeric(20,6) NULL;
+COMMENT ON COLUMN public.tmp_orders_group_package_detail.dose IS '单次剂量';
+
+
+ALTER TABLE public.tmp_orders_group_package_detail ADD rate_code varchar(255) NULL;
+COMMENT ON COLUMN public.tmp_orders_group_package_detail.rate_code IS '用药频次';
+
+
+ALTER TABLE public.tmp_orders_group_package_detail ADD dispense_per_duration int4 NULL;
+COMMENT ON COLUMN public.tmp_orders_group_package_detail.dispense_per_duration IS '用药天数';	
+
+
+ALTER TABLE public.tmp_orders_group_package_detail ADD method_code varchar(255) NULL;
+COMMENT ON COLUMN public.tmp_orders_group_package_detail.method_code IS '给药途径';	
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510211012 add_column_tmp_orders_group_package_detail', '1.0.0');