更改枚举类型;
Merge branch 'feivorid'