Merge branch 'cygx_10.3' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report.go

@@ -587,7 +587,9 @@ func (this *ReportController) List() {
 				list[k].IsHaveVideo = true
 			}
 			list[k].ImgUrlPc = mapCategoryUrl[v.CategoryId]
-
+			if v.Resource == 2 {
+				v.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
+			}
 			//if mapCategoryUrl[v.CategoryId] == "" {
 			//	if detail.ChartPermissionId == utils.YI_YAO_ID {
 			//		list[k].ImgUrlPc = utils.YI_YAO_QI_TA

controllers/tactics.go

@@ -178,6 +178,12 @@ func (this *TacticsController) List() {
 		}
 		resp.MatchTypeName = detail.MatchTypeName
 	}
+
+	for _, v := range list {
+		if v.Resource == 2 {
+			v.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
+		}
+	}
 	//lenList := len(list)
 	//for i := 0; i < lenList; i++ {
 	//	item := list[i]