From f1b869d003effd2d00eb19377937d8e2142d802b Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 6 Dec 2022 16:59:47 +0800
Subject: [PATCH] * Merge SQL.

---
 db/update18.0.beta1.sql | 2 ++
 db/update18.0.sql       | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 db/update18.0.sql

diff --git a/db/update18.0.beta1.sql b/db/update18.0.beta1.sql
index e7e4c35cbd..d9197b8193 100644
--- a/db/update18.0.beta1.sql
+++ b/db/update18.0.beta1.sql
@@ -1 +1,3 @@
+ALTER TABLE `zt_story` ADD COLUMN `siblings` varchar(255) NOT NULL AFTER `linkRequirements`;
+ALTER TABLE `zt_productplan` MODIFY COLUMN `branch` varchar(255) NOT NULL DEFAULT '0';
 ALTER TABLE `zt_effort` ADD `extra` text COLLATE 'utf8_general_ci' NOT NULL AFTER `end`;
diff --git a/db/update18.0.sql b/db/update18.0.sql
deleted file mode 100644
index ecdd8e79a2..0000000000
--- a/db/update18.0.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `zt_story` ADD COLUMN `siblings` varchar(255) NOT NULL AFTER `linkRequirements`;
-
-ALTER TABLE `zt_productplan` MODIFY COLUMN `branch` varchar(255) NOT NULL DEFAULT '0';