校园活动和Splash换了个数据库
Merge branch 'macro_dev' of https://github.com/iSCAU/iSCAU-Android into macro_dev