Merge branch 'cygx_10.9.1' into debug

controllers/company.go

@@ -9285,9 +9285,9 @@ func (this *CompanyTodoController) CompanyActivitySpecialPointsBill() {
 		if v.ActivityId == 0 {
 			item.Content = v.Content
 		} else {
-			if v.DoType == 1 && v.Way == 1 {
+			if v.DoType == 1 && v.Way != 4 {
 				item.Content = item.ActivityName + "--报名"
-			} else if v.DoType == 2 && v.Way == 1 {
+			} else if v.DoType == 2 && v.Way != 4 {
 				item.Content = item.ActivityName + "--取消报名"
 			} else if v.Way == 4 {
 				item.Content = item.ActivityName + "--活动取消"