修改登陆的方式等
添加注释
添加注解
Merge branch 'anyTime+char_branch' 合并

Conflicts:

Time-Line.xcworkspace/xcuserdata/IF.xcuserdatad/UserInterfaceState.xcuse
rstate