Merge pull request #9 from JohnCny/master

merge
[mod]调整
Merge pull request #10 from JohnCny/master

merge
[mod]联动bug
Merge pull request #30 from tanwh/master

[mod]联动bug