调节字段顺序
Merge branch 'tutor-improve'