1232
Merge branch 'master' of https://github.com/wzhen22/JDshoppingItem

Conflicts:

JDshoppingItem.xcodeproj/project.xcworkspace/xcuserdata/ty.xcuserdatad/U
serInterfaceState.xcuserstate