代码更新
Merge branch '零售通、资讯平台、协同办公'

Conflicts:
	KONKA_MARKET/KONKA_MARKET.xcodeproj/project.pbxproj

KONKA_MARKET/KONKA_MARKET.xcodeproj/project.xcworkspace/xcuserdata/apple
.xcuserdatad/UserInterfaceState.xcuserstate

KONKA_MARKET/KONKA_MARKET.xcodeproj/xcuserdata/apple.xcuserdatad/xcdebug
ger/Breakpoints.xcbkptlist

KONKA_MARKET/KONKA_MARKET/ViewController/BaseView/BaseViewXIB/HYOARetail
sTableViewCell.xib