Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -280,7 +280,7 @@ func (this *ActivityCoAntroller) ActivityList() {
 	}
 
 	condition += ` AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr
-	total, err := models.GetActivityCount(condition, playBack, pars)
+	total, err := models.GetActivityCount(condition, playBack, pars, 0)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()