Merge remote-tracking branch 'origin/master'

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

@@ -31,7 +31,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" +
-            "from `admin`";
+            " from `admin` ";
 
     @Override
     public int insertAdmin(Admin admin){

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

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