From 4b033b72b693801e753df0d4e0365b0b91b7f66b Mon Sep 17 00:00:00 2001
From: Chunxiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:39:25 +0800
Subject: [PATCH] Merge branch 'wangjr_develop' into fix-1936

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

diff --git a/src/test.txt b/src/test.txt
index d2e1e69a..d2286d69 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-修改详细数据描述
+Merge branch 'wangjr_develop' into fix-1936