Merge pull request #19 from JohnCny/master

merge
Merge pull request #60 from tanwh/master

[mod]权限后台[mod]几个bug
Merge pull request #20 from JohnCny/master

merge
[add]未提交
Merge pull request #61 from qkhj/master

add
Merge pull request #43 from JohnCny/master

merge