Merge branch 'cygx_9.2' into debug

controllers/report.go

@@ -681,7 +681,7 @@ func (this *ReportController) List() {
 				list[k].IsRed = true
 			}
 			timeLineRed := false
-			if count < 2 {
+			if count < 2 && v.SubCategoryName == "时间线" && recordItem.CreateTime.Before(utils.StrTimeToTime(v.PublishTime)){
 				timeLineRed = true
 			} else if count > 1 && recordItem.CreateTime.Before(utils.StrTimeToTime(v.PublishTime)) {
 				timeLineRed = true