Merge branch 'banner_history' into debug

controllers/banner.go

@@ -313,7 +313,6 @@ func (this *BannerController) BannerStatistic() {
 	}
 	for _, v := range urlList {
 		v.SourceList = souceMap[v.BannerUrl]
-		v.ActivityName = v.Remark + "(" +v.StartDate+"-"+v.EndDate+")"
 	}
 
 

models/banner_view_history.go

@@ -55,7 +55,6 @@ type BannerHistoryListRespItem struct {
 	StartDate       string
 	EndDate         string
 	Remark          string
-	ActivityName    string
 }
 
 type BannerHistoryListResp struct {