commit by shenqiang
yangbing add
yangbing edit
add yangbing
resolve conflit with yangbing
resolve conflit with yangbing
eidt 2
Merge pull request #3 from pinguo-yangbing/master

eidt 2
merge code
merge code
Merge pull request #9 from pinguo-shenqiang/master

解决冲突