Merge branch 'cygx_12.7' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

services/micro_roadshow.go

@@ -875,7 +875,7 @@ func GetActivityLYHFMapByActivityIds(activityIds []int) (mapResp map[int]bool) {
 	}
 	condition = ` AND activity_id IN (` + utils.GetOrmInReplace(lenArr) + `)  `
 	pars = append(pars, activityIds)
-	list, e := models.GetCygxActivityList(condition, pars, 0, lenArr)
+	list, e := models.GetActivityListByCondition(condition, pars)
 	if e != nil {
 		err = errors.New("GetIndustrialManagementNewList, Err: " + e.Error())
 		return