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

controllers/english_report/email.go

@@ -889,7 +889,7 @@ func (this *EnglishReportEmailController) UvList() {
 	}
 	startSize = paging.StartIndex(currentIndex, pageSize)
 
-	total, list, e := models.GetEnglishReportEmailPvPageList(cond, pars, startSize, pageSize)
+	total, list, e := models.GetEnglishReportEmailUvPageList(cond, pars, startSize, pageSize)
 	if e != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取英文研报邮箱uv列表失败, Err: " + e.Error()

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 []*EnglishReportEmailUvResp, err error) {
+func GetEnglishReportEmailPvPageList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*EnglishReportEmailPvResp, err error) {
 	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT
 				b.name,
@@ -78,7 +78,7 @@ func GetEnglishReportEmailPvPageList(condition string, pars []interface{}, start
 }
 
 // GetEnglishReportEmailUvPageList 获取邮箱uv列表-分页
-func GetEnglishReportEmailUvPageList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*EnglishReportEmailPvResp, err error) {
+func GetEnglishReportEmailUvPageList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*EnglishReportEmailUvResp, err error) {
 	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT
 				b.name,