加強查詢條件
Merge branch 'master' of https://github.com/kingwang317/it4fun-fuel