Toilet: 请修改新写的子类别重复判别函数
merge the conflicts.
Merge branch 'master' of github.com:hustcalm/ucas-life-manager
小修改