diff --git a/src/test.txt b/src/test.txt
index b2c71f2d..0a76b39a 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-权限管理
+Merge branch 'V20211115' into liuzx_trainjob