Merge branch 'yx_1.1' into debug

controllers/cygx/activity_signup.go

@@ -846,7 +846,6 @@ func (this *ActivitySignupCoAntroller) SalonSignupEdit() {
 			br.ErrMsg = "活动ID错误，Err:" + err.Error() + "activityId：" + strconv.Itoa(detail.ActivityId)
 			return
 		}
-		chartPermissionId = activityInfo.ChartPermissionId
 		if activityInfo.IsLimitPeople > 0 {
 			//获取这个活动已经报名的用户数量
 			totalSignup, errSignup := cygx.GetActivitySignupCountByActivityId(detail.ActivityId)