Merge branch 'feature/cp-new' into feature/3.9.0

domain/model/cp_m/rank.go

@@ -42,7 +42,7 @@ func PageCpDayRank(model *domain.Model, beginDate, endDate string, offset, limit
 	var ranks []CpDayRank
 	if err := model.DB().Table("cp_day_rank r").Joins("INNER JOIN cp_relation c ON c.id = r.cp_id").
 		Where("r.date BETWEEN ? AND ?", beginDate, endDate).Group("cp_id").Select("cp_id,r.user_id1,r.user_id2,SUM(r.score) score").
-		Order("r.score DESC").Offset(offset).Limit(limit).Find(&ranks).Error; err != nil {
+		Order("score DESC").Offset(offset).Limit(limit).Find(&ranks).Error; err != nil {
 		model.Log.Errorf("PageCpDayRank fail:%v", err)
 	}
 	return ranks