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

services/activity_special.go

@@ -645,9 +645,6 @@ func GetActivitySpecialList(user *models.WxUserItem, currentIndex, pageSize int,
 		if startSizePrepare == 0 {
 			listPrepare[0].Explain = utils.ACtIVITY_SPECIAL_EXPLAIN
 		}
-	} else {
-		err = nil
-		return
 	}
 	total = totalConfirm + totalPrepare
 	//处理封面图片