Merge remote-tracking branch 'origin/master'

mhotel/src/com/happy/dao/impl/AdminImplDao.java

@@ -30,7 +30,7 @@ public class AdminImplDao implements AdminDao {
     }
 
     public String selectSql="select " +
-            "id,admin_name,password,user_name,phone,level,admin_power,remark,create_id, DATE_FORMAT(create_date,'%Y-%m-%d %T') create_date,DATE_FORMAT(modify_date,'%Y-%m-%d %T') modify_date,status,openid" +
+            "id,admin_name,user_name,phone,level,admin_power,remark,create_id, DATE_FORMAT(create_date,'%Y-%m-%d %T') create_date,DATE_FORMAT(modify_date,'%Y-%m-%d %T') modify_date,status,openid" +
             " from `admin` ";
 
     @Override

mhotel/src/com/happy/dao/impl/AdminManagerImplDao.java

@@ -30,7 +30,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
 
     public String selectSql =
         "select " +
-        "a.id, a.manager_id, a.admin_name, a.password, a.hotel_name, a.hotel_township, b.name hotel_township_name, a.corpn_name, a.corpn_phone, a.level, a.admin_power, a.bank_card, a.card_name, a.bank_name, a.create_id, DATE_FORMAT(a.create_date,'%Y-%m-%d %T') create_date,DATE_FORMAT(a.modify_date,'%Y-%m-%d %T') modify_date,a.status,a.remark,a.openid " +
+        "a.id, a.manager_id, a.admin_name, a.hotel_name, a.hotel_township, b.name hotel_township_name, a.corpn_name, a.corpn_phone, a.level, a.admin_power, a.bank_card, a.card_name, a.bank_name, a.create_id, DATE_FORMAT(a.create_date,'%Y-%m-%d %T') create_date,DATE_FORMAT(a.modify_date,'%Y-%m-%d %T') modify_date,a.status,a.remark,a.openid " +
         "from `admin_manager` a " +
         "left join hotel_dict b on a.hotel_township = b.id";