修改database.yml
解决database.yml冲突
Merge branch 'dev' of github.com:cnepaycd/QYBUser into dev