fix db 2
Merge branch 'master' of github.com:yinyuantao/demo_app