Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_10.6

controllers/activity.go

@@ -2321,7 +2321,8 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 		br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
 		return
 	}
-	condition += `AND art.is_limit_people = 1 ` + conditionActivity
+	//condition += `AND art.is_limit_people = 1 ` + conditionActivity
+	condition += conditionActivity
 	sortTime = ` mintimesort ASC `
 	listActivity, err := models.GetActivityLabelListAll(condition, sortTime, pars, startSize, pageSize)
 	if err != nil {