添加注解
Merge branch 'anyTime+char_branch'

Conflicts:

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