Merge pull request '更正添加' (#5 ) from yangyanling_branch into develop

修改
Merge branch 'main' of https://bdgit.educoder.net/pzk9h3i5c/523 into yangyanling_branch
1 changed files with 3 additions and 2 deletions
--- a/1.txt
+++ b/1.txt
@ -1,4 +1,5 @@
 111
 组长develop_lilwenyao
-组员develop_yanzhiqiang
+组员yanzhiqiang
-组员zhangyuhang
+组员zhangyuhang
 组员yangyanling
Author	SHA1	Message	Date
pzk9h3i5c	5fc00aee90	Merge pull request '更正添加' (#5 ) from yangyanling_branch into develop	8 months ago
YYL	46ab19444d	修改	8 months ago
YYL	340dc1a299	Merge branch 'main' of https://bdgit.educoder.net/pzk9h3i5c/523 into yangyanling_branch # Conflicts: # 1.txt	8 months ago
pzk9h3i5c	941b6a5945	Merge pull request '正式版合并' (#4 ) from develop into main	8 months ago
YYL	1a8cb273e1	组员YangYanLing123	8 months ago
liwenyao	380c959296	yangyanling分支测试	8 months ago
liwenyao	62ef046e80	yzq更新测试	8 months ago