From 1e8ccfec6ebcf7787def13165d9932b0cccefc49 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 20 六月 2025 14:34:45 +0800
Subject: [PATCH] 1.文件上传格式调整 2.表格调整

---
 main-business/src/main/resources/db/migration/postgresql/V20250604111200__create_table_official_inventory.sql |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/main-business/src/main/resources/db/migration/postgresql/V20250604111200__create_table_official_inventory.sql b/main-business/src/main/resources/db/migration/postgresql/V20250604111200__create_table_official_inventory.sql
index 94908ff..a8043a8 100644
--- a/main-business/src/main/resources/db/migration/postgresql/V20250604111200__create_table_official_inventory.sql
+++ b/main-business/src/main/resources/db/migration/postgresql/V20250604111200__create_table_official_inventory.sql
@@ -14,6 +14,7 @@
     registrant_id             VARCHAR(50)    NOT NULL,           -- 鐧昏浜篿d
     type             VARCHAR(50)    NOT NULL,           -- 鐧昏浜篿d
     pending_id                BIGINT,                            -- 寰呭叆搴搃d
+    merge_id                BIGINT,                            -- 鍚堝苟id
     registration_date         TIMESTAMP WITHOUT TIME ZONE,
 
     deleted                   INT            NOT NULL DEFAULT 0, -- 杞垹闄ゆ爣蹇楋細0=鏈垹闄わ紝1=宸插垹闄�
@@ -37,6 +38,7 @@
 COMMENT ON COLUMN official_inventory.pending_replenishment IS '寰呰ˉ搴�';
 COMMENT ON COLUMN official_inventory.registrant_id IS '鐧昏浜篿d';
 COMMENT ON COLUMN official_inventory.registration_date IS '鐧昏鏃ユ湡';
+COMMENT ON COLUMN official_inventory.merge_id IS '鍚堝苟id';
 
 COMMENT ON COLUMN official_inventory.deleted IS '杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�';
 COMMENT ON COLUMN official_inventory.create_by IS '鍒涘缓璇ヨ褰曠殑鐢ㄦ埛';

--
Gitblit v1.9.3