From 6c733ef76c414ab29a449bc4c5dbf9e124f99259 Mon Sep 17 00:00:00 2001
From: xaoyaoo <xaoyaoo@qq.com>
Date: Tue, 12 Dec 2023 16:01:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/CHANGELOG.md | 6 ++++++
 setup.py         | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index 6806dbb..a094674 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -1,5 +1,11 @@
 # 更新日志
 
+## v2.3.11 (2023-12-11)
+
+### 优化
+
+- 完善合并数据库逻辑
+
 ## v2.3.10 (2023-12-11)
 
 ### 优化
diff --git a/setup.py b/setup.py
index 64f8403..4a35f0a 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
-version = "2.3.10"
+version = "2.3.11"
 
 install_requires = [
     "psutil",