git merge

Signed-off-by: zhoujw <617726909@qq.com>
git merge

Signed-off-by: zhoujw <617726909@qq.com>
Merge branch 'fixbug'

Conflicts:
	info
modify README.md