Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/AssembleController.java

@@ -81,8 +81,9 @@ public class AssembleController extends BaseController {
 		indexMap.put("menuList",menuList);
 		indexMap.put("bannerList",toBannerList);
 		indexMap.put("messageTotal",totalMap.get("messageTotal"));
-		indexMap.put("hotelMap",hotelRes.getData());
-		indexMap.put("shopMap",shopRes.getData());
+		indexMap.put("tpHotel",hotelRes.getData());
+		indexMap.put("tpShopType",((Map<Object, Object>)shopRes.getData()).get("tpShopType"));
+		indexMap.put("tpShopList",((Map<Object, Object>)shopRes.getData()).get("tpShopList"));
 		indexMap.put("toDoTotal",totalMap.get("toDoTotal"));
 		responseBean.addSuccess(indexMap);
 		return responseBean;