[git_corp1][test conflicts4]

Signed-off-by: t427794322 <t427794322@126.com>
jjjjjjjkkkk

Signed-off-by: t427794322 <t427794322@126.com>
[git_corp1][test conficts 5]
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/git_corp1/TestCorp.java


Signed-off-by: t427794322 <t427794322@126.com>