修改首页index商家显示
Merge branch 'master' of https://github.com/wayne0332/xiaojh.git
添加首页商家活动，修改活动service查询商家活动的空指针异常
Merge branch 'master' of https://github.com/wayne0332/xiaojh.git