解决合并冲突

迁移记录-DB变更记录/202510221011 add_column_tmp_orders_group_package_detail.sql

@@ -0,0 +1,7 @@
+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 '小单位单次剂量';
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510221011 add_column_tmp_orders_group_package_detail', '1.0.0');