Merge remote-tracking branch 'origin/dev' into test

@@ -208,7 +208,7 @@ and  (mark_flag&1)>0
 order by collect_time desc
 limit ?`)
 
-	sqlCount := `select count(0) from chance_favorite where user_id =? and enable_status=1 and (mark_flag&2)>0`
+	sqlCount := `select count(0) from chance_favorite where user_id =? and enable_status=1 and (mark_flag&1)>0`
 	if err = utils.ExecuteQueryOne(&total, sqlCount, uid); err != nil {
 		return
 	}

@@ -96,12 +96,13 @@ func GetComments(userId int64, sourceType int, sourceId int64, lastId int64, pag
 	if lastId > 0 {
 		sql.Where(fmt.Sprintf("id<%d", lastId))
 	}
+	log.Debug(sql.Strings())
 	if total, err = sql.Querys(&v); err == nil {
 		if total == 0 {
-			log.Debug(sql.Strings())
+			//log.Debug(sql.Strings())
 		}
 		return
 	}
-
+	//log.Debug(sql.Strings())
 	return
 }