JD
Merge branch 'master' of https://github.com/1036938520/JD_Mall

Conflicts:
	京东商城.xcodeproj/project.pbxproj

京东商城.xcodeproj/project.xcworkspace/xcuserdata/ty.xcuserdatad/UserInterfa
ceState.xcuserstate