Threadtest

Signed-off-by: 1139537275 <1139537275@qq.com>
Merge branch 'master' of github.com:XianNianTec/test

Conflicts:
	main.cpp