Merge remote-tracking branch 'origin/master'

app/md/md_data_center_generate_data.go

@@ -66,6 +66,7 @@ type DataCenterIncomeDataData struct {
 	Name             string `json:"name" example:"名称"`
 	Platform         string `json:"platform" example:"平台名称"`
 	AdvName          string `json:"adv_name" example:"广告位"`
+	AdvId            string `json:"adv_id" example:"广告位Id"`
 	State            string `json:"state" example:"状态id"`
 	ExposureCount    string `json:"exposure_count" example:"现-曝光量"`
 	ClickCount       string `json:"click_count" example:"现-点击量"`

app/svc/svc_data_center_generate_data.go

@@ -51,6 +51,7 @@ func DataCenterIncomeDataListForOpen(c *gin.Context, req md.DataCenterGenerateDa
 			if tmpSlot["name"] != "" {
 				tmp.AdvName = tmpSlot["name"]
 			}
+			tmp.AdvId = v.SlotId
 			data = append(data, tmp)
 		}
 	}
@@ -102,6 +103,7 @@ func DataCenterIncomeDataList(c *gin.Context, req md.DataCenterGenerateDataReq)
 			if tmpSlot["name"] != "" {
 				tmp.AdvName = tmpSlot["name"]
 			}
+			tmp.AdvId = v.SlotId
 			data = append(data, tmp)
 		}
 	}
@@ -167,6 +169,7 @@ func DataCenterIncomeDataListOutput(c *gin.Context, req md.DataCenterGenerateDat
 			if tmpSlot["name"] != "" {
 				tmp.AdvName = tmpSlot["name"]
 			}
+			tmp.AdvId = v.SlotId
 			i := utils.IntToStr(k + 2)
 			data["A"+i] = tmp.Name
 			data["B"+i] = tmp.Date