合并版本
Merge branch '零售通、资讯平台、协同办公' of https://github.com/huayancreate/konka into 零售通、资讯平台、协同办公

Conflicts:

KONKA_MARKET/KONKA_MARKET/ViewController/HomeView/HYHomeViewController.m