Merge pull request #5 from JohnCny/master

merge
[modify]新增窗口，查询条件
Merge pull request #29 from qkhj/master

modify