Merge pull request #3 from siren186/master

syn
Merge pull request #4 from siren186/master

syn
*修改判断条件
Merge branch 'master' of https://github.com/picctree/zpublic
Merge pull request #9 from picctree/master

*修改判断