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