Merge pull request #14 from JohnCny/master

merge
Merge pull request #15 from JohnCny/master

[mod]修改数据库字段名
Merge pull request #21 from tanwh/master

merge