代码更新
Merge branch 'master' of https://github.com/huayancreate/konka

Conflicts:

KONKA_MARKET/KONKA_MARKET/ViewController/HomeView/HYHomeViewController.m

KONKA_MARKET/KONKA_MARKET/ViewController/HomeView/HYHomeViewController.x
ib
代码更新