修改判断
Merge branch 'szy' of https://github.com/michael9/mydemo4l_a.git into szy