From 0400644aaa44f49898105e964170a9312506c38d Mon Sep 17 00:00:00 2001
From: daimiaopeng <844362911@qq.com>
Date: Wed, 6 Dec 2023 10:40:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E4=B8=AD=E7=BB=93=E6=9E=9C=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=88=B0UTF-8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/DataBase/merge.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/DataBase/merge.py b/app/DataBase/merge.py
index e28073e..7679821 100644
--- a/app/DataBase/merge.py
+++ b/app/DataBase/merge.py
@@ -13,6 +13,7 @@ def merge_databases(source_paths, target_path):
             if not os.path.exists(source_path):
                 break
             db = sqlite3.connect(source_path)
+            db.text_factory = bytes 
             cursor = db.cursor()
             sql = '''
             SELECT TalkerId,MsgsvrID,Type,SubType,IsSender,CreateTime,Sequence,StrTalker,StrContent,DisplayContent,BytesExtra