Merge branch 'bzq1/uv_custom' of eta_server/eta_api into debug

models/english_report_email_pv.go

@@ -51,7 +51,7 @@ type EnglishReportEmailUvResp struct {
 }
 
 // GetEnglishReportEmailPageList 获取邮箱pv列表-分页
-func GetEnglishReportEmailPvPageList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*EnglishReportEmailPvResp, err error) {
+func GetEnglishReportEmailPvPageList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*EnglishReportEmailUvResp, err error) {
 	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT
 				b.name,