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

@@ -1,3 +1,4 @@
<<<<<<< HEAD
ALTER TABLE "doc_statistics_definition"
ADD COLUMN "dict_name" varchar(50),
ADD COLUMN "dict_type" varchar(50);
@@ -5,6 +6,15 @@ ALTER TABLE "doc_statistics_definition"
COMMENT ON COLUMN "doc_statistics_definition"."dict_name" IS '字典名称';
COMMENT ON COLUMN "doc_statistics_definition"."dict_type" IS '字典类型';
=======
ALTER TABLE "public"."doc_statistics_definition"
ADD COLUMN "dict_name" varchar(50),
ADD COLUMN "dict_type" varchar(50);
COMMENT ON COLUMN "public"."doc_statistics_definition"."dict_name" IS '字典名称';
COMMENT ON COLUMN "public"."doc_statistics_definition"."dict_type" IS '字典类型';
>>>>>>> v1.3