From c0d088b896bd7d0a4fb6b4972a1d7515528142ab Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Tue, 14 Mar 2023 17:52:28 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'V20220718.patch?=
 =?UTF-8?q?=E5=90=88=E5=85=A5develop'=20(#2570)=20from=20V20220718.patch?=
 =?UTF-8?q?=20into=20develop?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test.txt b/src/test.txt
index 84da4fb4..69d17870 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-return DataseNname when ErrorNewDataPrepare
+Merge pull request 'V20220718.patch合入develop' (#2570) from V20220718.patch into develop