提交merge1.3

2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
--- a/add_column_tmp_orders_group_package_detail.sql
+++ b/add_column_tmp_orders_group_package_detail.sql
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
-ALTER TABLE tmp_orders_group_package_detail ADD dose_quantity numeric(20,6) NULL;
-COMMENT ON COLUMN tmp_orders_group_package_detail.dose_quantity IS '小单位单次剂量';
-=======
 ALTER TABLE public.tmp_orders_group_package_detail ADD dose_quantity numeric(20,6) NULL;
 COMMENT ON COLUMN public.tmp_orders_group_package_detail.dose_quantity IS '小单位单次剂量';
->>>>>>> v1.3


   -- 插入为tmp_activity_device表添加列的迁移记录