Merge branch 'wangxiaomo/refactor_codeschool'
修正时间类型