Merge branch 'master' of https://e.coding.net/chuanghaikeji/jinganxiangsu/Homestay_app_houtai

mhotel/src/com/happy/action/AppHomePageAction.java

@@ -349,7 +349,7 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
             ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
             return null;
         }
-        hotel.setHotelFileInfoList(fileService.queryListByLinkId(hotelId));
+        hotel.setHotelFileInfoList(fileService.queryListByLinkId(hotel.getManagerId()+""));
 
         // 添加是否已收藏的酒店
         if (!Func.checkNull(userId))