Merge branch 'cygx_14.2' of http://8.136.199.33:3000/hongze/hongze_clpt into debug

controllers/report.go

@@ -987,9 +987,9 @@ func (this *MobileReportController) SearchReport() {
 			} else {
 				item.Resource = 1
 				if v.ArticleTypeId > 0 {
-					item.ResourceObj = "articlevmp"
-				} else {
 					item.ResourceObj = "articleyx"
+				} else {
+					item.ResourceObj = "articlevmp"
 				}
 
 			}