Merge branch 'master' of github.com:jouyouyun/life_search
Merge branch 'widget'
Merge branch 'master' of github.com:jouyouyun/life_search
fix bug