Merge remote-tracking branch 'origin/master'

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

@@ -96,7 +96,7 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
                 return null;
             }else{
                 //是否主账号首次登录
-                Hotel hotel = hotelService.getOen("and manager_id = '"+login.getId()+"'");
+                Hotel hotel = hotelService.getOen("and manager_id = "+login.getManagerId()+"");
                 if(hotel==null && "2".equals(login.getLevel())){
                     resultJson.put("isLogin",1);
                 }else{