fix db schema
Merge branch 'master' of https://github.com/sctravel/sctravel_develop