提交merge1.3

迁移记录-DB变更记录/202509081020add_table_tmp_orders_group_package.sql

@@ -7,7 +7,11 @@
 		CACHE 1;
 
 
+<<<<<<< HEAD
 CREATE TABLE "tmp_orders_group_package" (
+=======
+CREATE TABLE "public"."tmp_orders_group_package" (
+>>>>>>> v1.3
   "id" int8 NOT NULL DEFAULT nextval('tmp_orders_group_package_id_seq'::regclass),
   "name" varchar(255) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
   "package_type_enum" int4 NOT NULL,
@@ -23,6 +27,7 @@ CREATE TABLE "tmp_orders_group_package" (
 )
 ;
 
+<<<<<<< HEAD
 ALTER TABLE "tmp_orders_group_package" 
   OWNER TO "postgres";
 
@@ -49,6 +54,34 @@ COMMENT ON COLUMN "tmp_orders_group_package"."update_by" IS '更新人';
 COMMENT ON COLUMN "tmp_orders_group_package"."update_time" IS '更新时间';
 
 COMMENT ON TABLE "tmp_orders_group_package" IS '医嘱组合套餐';	
+=======
+ALTER TABLE "public"."tmp_orders_group_package" 
+  OWNER TO "postgres";
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."id" IS 'ID';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."name" IS '名称';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."package_type_enum" IS '组套包类型';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."organization_id" IS '科室id';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."practitioner_id" IS '参与者id';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."tenant_id" IS '租户ID';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."delete_flag" IS '删除状态';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."create_by" IS '创建人';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."create_time" IS '创建时间';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."update_by" IS '更新人';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."update_time" IS '更新时间';
+
+COMMENT ON TABLE "public"."tmp_orders_group_package" IS '医嘱组合套餐';	
+>>>>>>> v1.3
 
 -- 插入添加临时订单分组包表的迁移记录
 INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)