31231

231231
Merge branch 'master' of https://github.com/393846671/CollectionViewDemo

Conflicts:

CollectionViewDemo.xcodeproj/project.xcworkspace/xcuserdata/maolin.xcuse
rdatad/UserInterfaceState.xcuserstate