这个文件是使用Gui工具上传的测试
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/jieyebing/work.git
Merge branch 'master' of https://github.com/jieyebing/work.git
test test

Signed-off-by: jieyebing <jieyebing@gmail.com>