Merge branch 'release/base-model'
修复进入设置界面crash的bug。
Merge branch 'hotfix/settingCrash' into develop