Merge branch 'CRM_15.7' into debug

controllers/yb_research_signup_statistics.go

@@ -84,6 +84,8 @@ func (this *BannerController) StatisticsItem() {
 			resp.NoPay.Count += 1
 		}
 	}
+	resp.HasPayed.Name = "已付款"
+	resp.NoPay.Name = "未付款"
 	resp.NoPay.Percentage = resp.NoPay.Count * 100 / resp.Total
 	resp.HasPayed.Percentage = resp.HasPayed.Count * 100 / resp.Total
 

models/yb_research_signup_statistics.go

@@ -80,6 +80,7 @@ type YbResearchSignupStatisticsItemsResp struct {
 	NoPay    PayItem
 }
 type PayItem struct {
+	Name       string
 	Count      int
 	Amount     float64
 	Percentage int