需求修改
Merge branch '1.1'

Conflicts:

尚品易馆/IMFiveApp.xcodeproj/project.xcworkspace/xcuserdata/guangmingtianxia
.xcuserdatad/UserInterfaceState.xcuserstate