盘点查询条件修改
Merge branch 'master' of https://github.com/kukucat0322/Gtroo