提交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

@@ -7,7 +7,11 @@
CACHE 1;
<<<<<<< HEAD
CREATE TABLE "tmp_orders_group_package_detail" (
=======
CREATE TABLE "public"."tmp_orders_group_package_detail" (
>>>>>>> v1.3
"id" int8 NOT NULL DEFAULT nextval('tmp_orders_group_package_detail_id_seq'::regclass),
"group_package_id" int8 NOT NULL,
"order_definition_id" int8 NOT NULL,
@@ -24,6 +28,7 @@ CREATE TABLE "tmp_orders_group_package_detail" (
)
;
<<<<<<< HEAD
ALTER TABLE "tmp_orders_group_package_detail"
OWNER TO "postgres";
@@ -52,6 +57,36 @@ COMMENT ON COLUMN "tmp_orders_group_package_detail"."update_by" IS '更新人';
COMMENT ON COLUMN "tmp_orders_group_package_detail"."update_time" IS '更新时间';
COMMENT ON TABLE "tmp_orders_group_package_detail" IS '医嘱组合套餐明细';
=======
ALTER TABLE "public"."tmp_orders_group_package_detail"
OWNER TO "postgres";
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."id" IS 'ID';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."group_package_id" IS '组合套餐id';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."order_definition_id" IS '医嘱定义id';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."order_definition_table" IS '医嘱定义表名';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."quantity" IS '数量';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."unit_code" IS '单位编码';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."tenant_id" IS '租户ID';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."delete_flag" IS '删除状态';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."create_by" IS '创建人';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."create_time" IS '创建时间';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."update_by" IS '更新人';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."update_time" IS '更新时间';
COMMENT ON TABLE "public"."tmp_orders_group_package_detail" IS '医嘱组合套餐明细';
>>>>>>> v1.3
-- 插入添加临时订单分组包详情表的迁移记录
INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)