Merge pull request #38 from JohnCny/master

merge
[mod]修改查询条件
Merge pull request #54 from tanwh/master

[mod]修改查询条件