Merge remote-tracking branch 'origin/master'

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

@@ -229,7 +229,7 @@ public class BookImplDao implements BookDao {
 
     @Override
     public int queryTotal(String sqlx) {
-        String sql = "SELECT count(*) FROM`booking` where is_delete=1 "+sqlx;
+        String sql = "SELECT count(*) FROM`booking` where 1=1 "+sqlx;
         MapSqlParameterSource sps = new MapSqlParameterSource();
         return namedParameterJdbcTemplate.queryForInt(sql, sps);
     }