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

controllers/activity.go

@@ -1203,6 +1203,7 @@ func (this *ActivityController) SignupCancel() {
 	}
 	checkTime, _ := services.CheckSiginupDeadline(activityInfo)
 	if !checkTime {
+		br.Msg = "报名名单已提交举办方，若想取消，请联系对口销售"
 		br.ErrMsg = "报名名单已提交举办方，若想取消，请联系对口销售"
 		return
 	}
@@ -1213,6 +1214,7 @@ func (this *ActivityController) SignupCancel() {
 		} else {
 			br.Msg = "活动开始前1小时内无法取消报名，请联系对口销售处理"
 		}
+		br.ErrMsg = br.Msg
 		return
 	}
 	total, err := models.GetActivitySignupCount(uid, activityId)